chamilo / chamilo-lms

main/gradebook/lib/be/gradebookitem.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 interface GradebookItem
 {
-	public function get_item_type();
-	public function get_id();
-	public function get_name();
-	public function get_description();
-	public function get_course_code();
-	public function get_weight();
-	public function get_date();
-	public function is_visible();
-	public function get_icon_name();
-	public function getStudentList();
-	public function setStudentList($list);
-	public function calc_score($stud_id = null, $type = null);
+    public function get_item_type();
+    public function get_id();
+    public function get_name();
+    public function get_description();
+    public function get_course_code();
+    public function get_weight();
+    public function get_date();
+    public function is_visible();
+    public function get_icon_name();
+    public function getStudentList();
+    public function setStudentList($list);
+    public function calc_score($stud_id = null, $type = null);
 }

main/gradebook/lib/be/category.class.php

Indentation -2 removed lines

@@ -1571,7 +1571,6 @@ 
      * @param string $course_code Course code (optional)
      * @param int    $session_id Session ID (optional)
      * @param bool   $order
-
      * @return array Array of subcategories
      */
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@ 
      * This function, locks a category , only one who can unlock it is
      * the platform administrator.
      * @param int locked 1 or unlocked 0
-
      * @return bool
      * */
     public function lock($locked)

Spacing +63 added lines, -63 removed lines

@@ -199,7 +199,7 @@ 
      */
     public function set_session_id($session_id = 0)
     {
-        $this->session_id = (int)$session_id;
+        $this->session_id = (int) $session_id;
     }
 
     /**
@@ -288,7 +288,7 @@ 
         $skills = $this->get_skills();
         $skill_select = array();
         if (!empty($skills)) {
-            foreach($skills as $skill) {
+            foreach ($skills as $skill) {
                 $skill_select[$skill['id']] = $skill['name'];
             }
         }
@@ -322,7 +322,7 @@ 
      */
     public static function load_session_categories($id = null, $session_id = null)
     {
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
             return $cats;
@@ -335,7 +335,7 @@ 
         if (!empty($session_id)) {
             $tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
             $sql = 'SELECT id, course_code
-                    FROM '.$tbl_grade_categories. '
+                    FROM '.$tbl_grade_categories.'
                     WHERE session_id = '.$session_id;
             $result_session = Database::query($sql);
             if (Database::num_rows($result_session) > 0) {
@@ -375,7 +375,7 @@ 
     ) {
         //if the category given is explicitly 0 (not null), then create
         // a root category object (in memory)
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
 
@@ -386,8 +386,8 @@ 
         $sql = 'SELECT * FROM '.$tbl_grade_categories;
         $paramcount = 0;
         if (isset($id)) {
-            $sql.= ' WHERE id = '.intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE id = '.intval($id);
+            $paramcount++;
         }
 
         if (isset($user_id)) {
@@ -423,10 +423,10 @@ 
             if (empty($session_id)) {
                 $sql .= ' AND (session_id IS NULL OR session_id = 0) ';
             } else {
-                $sql .= ' AND session_id = '.(int)$session_id.' ';
+                $sql .= ' AND session_id = '.(int) $session_id.' ';
             }
             //}
-            $paramcount ++;
+            $paramcount++;
         }
 
         if (isset($parent_id)) {
@@ -598,7 +598,7 @@ 
                             $default_weight = $default_weight_setting;
                         }
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -615,7 +615,7 @@ 
                 }
             }
 
-            $gradebook= new Gradebook();
+            $gradebook = new Gradebook();
             $gradebook->update_skills_to_gradebook($this->id, $this->get_skills(false));
 
             return $id;
@@ -680,7 +680,7 @@ 
                         $params['description']      = $component['title'];
                         $params['user_id']          = api_get_user_id();
                         $params['parent_id']        = $this->id;
-                        $params['weight']           = $component['percentage']/100*$default_weight;
+                        $params['weight']           = $component['percentage'] / 100 * $default_weight;
                         $params['session_id']       = api_get_session_id();
                         $params['course_code']      = $this->get_course_code();
 
@@ -690,7 +690,7 @@ 
             }
         }
 
-        $gradebook= new Gradebook();
+        $gradebook = new Gradebook();
         $gradebook->update_skills_to_gradebook(
             $this->id,
             $this->get_skills(false),
@@ -710,7 +710,7 @@ 
         if (!empty($links)) {
             foreach ($links as $link_item) {
                 if (isset($link_item)) {
-                    $new_item_weight =  $new_weight * $link_item->get_weight() / $old_weight;
+                    $new_item_weight = $new_weight * $link_item->get_weight() / $old_weight;
                     $link_item->set_weight($new_item_weight);
                     $link_item->save();
                 }
@@ -751,7 +751,7 @@ 
                     visible=3';
         $res = Database::query($sql);
         $option = Database::fetch_array($res, 'ASSOC');
-        if ($option['num']>=1) {
+        if ($option['num'] >= 1) {
             return '&nbsp;&nbsp;<span class="resource-deleted">(&nbsp;'.get_lang('ResourceDeleted').'&nbsp;)</span>';
         } else {
             return false;
@@ -812,9 +812,9 @@ 
             $sql .= ' AND user_id = '.api_get_user_id();
         }
         if (!isset ($parent)) {
-            $sql.= ' AND parent_id is null';
+            $sql .= ' AND parent_id is null';
         } else {
-            $sql.= ' AND parent_id = '.intval($parent);
+            $sql .= ' AND parent_id = '.intval($parent);
         }
 
         $result = Database::query($sql);
@@ -912,7 +912,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
                     }
                 }
             }
@@ -1001,7 +1001,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
 
                         if ($ressum > $bestResult) {
                             $bestResult = $ressum;
@@ -1140,7 +1140,7 @@ 
                 // session, we don't check his registration to these, but this
                 // could be an improvement
                 if (!empty($session_id)) {
-                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int)$session_id;
+                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int) $session_id;
                 } else {
                     $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id is null OR session_id=0";
                 }
@@ -1164,9 +1164,9 @@ 
                 // could be an improvement
                 $sql .= " AND course_code  = '".Database::escape_string($course_code)."'";
                 if (!empty($session_id)) {
-                    $sql .= " AND session_id = ".(int)$session_id;
+                    $sql .= " AND session_id = ".(int) $session_id;
                 } else {
-                    $sql .="AND session_id IS NULL OR session_id=0";
+                    $sql .= "AND session_id IS NULL OR session_id=0";
                 }
             } else {
                 $sql .= ' AND course_code IN
@@ -1180,10 +1180,10 @@ 
                     )';
             }
         }elseif (api_is_platform_admin()) {
-            if (isset($session_id) && $session_id!=0) {
-                $sql.=' AND session_id='.intval($session_id);
+            if (isset($session_id) && $session_id != 0) {
+                $sql .= ' AND session_id='.intval($session_id);
             } else {
-                $sql.=' AND coalesce(session_id,0)=0';
+                $sql .= ' AND coalesce(session_id,0)=0';
             }
         }
         $result = Database::query($sql);
@@ -1191,7 +1191,7 @@ 
 
         // course independent categories
         if (empty($course_code)) {
-            $cats = Category::get_independent_categories_with_result_for_student (0, $stud_id, $cats);
+            $cats = Category::get_independent_categories_with_result_for_student(0, $stud_id, $cats);
         }
 
         return $cats;
@@ -1206,7 +1206,7 @@ 
     public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
     {
         if ($user_id == null) {
-            return Category::load(null,null,$course_code,0,null,$session_id);
+            return Category::load(null, null, $course_code, 0, null, $session_id);
         }
 
         $courseTable = Database :: get_main_table(TABLE_MAIN_COURSE);
@@ -1218,7 +1218,7 @@ 
         if (!empty($course_code)) {
             $sql .= " AND course_code = '".Database::escape_string($course_code)."' ";
             if (!empty($session_id)) {
-                $sql .= " AND session_id = ".(int)$session_id;
+                $sql .= " AND session_id = ".(int) $session_id;
             }
         } else {
             $sql .= ' AND course_code in
@@ -1234,7 +1234,7 @@ 
         $cats = Category::create_category_objects_from_sql_result($result);
         // course independent categories
         if (isset($course_code)) {
-            $indcats = Category::load(null,$user_id,$course_code,0,null,$session_id);
+            $indcats = Category::load(null, $user_id, $course_code, 0, null, $session_id);
             $cats = array_merge($cats, $indcats);
         }
 
@@ -1277,20 +1277,20 @@ 
             $targets[] = $root;
 
             if (isset($this->course_code) && !empty($this->course_code)) {
-                $crscats = Category::load(null,null,$this->course_code,0);
+                $crscats = Category::load(null, null, $this->course_code, 0);
                 foreach ($crscats as $cat) {
                     if ($this->can_be_moved_to_cat($cat)) {
-                        $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                        $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                        $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                        $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                     }
                 }
             }
 
-            $indcats = Category::load(null,$user,0,0);
+            $indcats = Category::load(null, $user, 0, 0);
             foreach ($indcats as $cat) {
                 if ($this->can_be_moved_to_cat($cat)) {
-                    $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                    $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                    $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                    $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                 }
             }
 
@@ -1303,11 +1303,11 @@ 
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
-        $subcats = Category::load(null,null,null,$catid);
+        $subcats = Category::load(null, null, null, $catid);
         foreach ($subcats as $cat) {
             if ($this->can_be_moved_to_cat($cat)) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
             }
         }
 
@@ -1320,7 +1320,7 @@ 
      * Impossible when origin and target are the same... children won't be processed
      * either. (a category can't be moved to one of its own children)
      */
-    private function can_be_moved_to_cat ($cat)
+    private function can_be_moved_to_cat($cat)
     {
         return $cat->get_id() != $this->get_id();
     }
@@ -1349,7 +1349,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
 
         foreach ($cats as $cat) {
             $cat->set_course_code($this->get_course_code());
@@ -1382,15 +1382,15 @@ 
             $user = (api_is_platform_admin() ? null : api_get_user_id());
             $cats = Category::get_root_categories_for_teacher($user);
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),null);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), null);
             }
         } else {
             // student
             $cats = Category::get_root_categories_for_student(api_get_user_id());
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(), 1);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), 1);
             }
         }
 
@@ -1400,14 +1400,14 @@ 
     /**
      * Internal function used by get_tree()
      */
-    private function add_subtree ($targets, $level, $catid, $visible)
+    private function add_subtree($targets, $level, $catid, $visible)
     {
-        $subcats = Category::load(null,null,null,$catid,$visible);
+        $subcats = Category::load(null, null, null, $catid, $visible);
 
         if (!empty($subcats)) {
             foreach ($subcats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),$visible);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), $visible);
             }
         }
 
@@ -1418,7 +1418,7 @@ 
      * Generate an array of courses that a teacher hasn't created a category for.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_not_created_course_categories ($user_id)
+    public function get_not_created_course_categories($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1440,9 +1440,9 @@ 
                 )';
         $result = Database::query($sql);
 
-        $cats=array();
-        while ($data=Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+        $cats = array();
+        while ($data = Database::fetch_array($result)) {
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1452,7 +1452,7 @@ 
      * Generate an array of all courses that a teacher is admin of.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_all_courses ($user_id)
+    public function get_all_courses($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1466,7 +1466,7 @@ 
         $result = Database::query($sql);
         $cats = array();
         while ($data = Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1479,7 +1479,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
         if (!empty($cats)) {
             foreach ($cats as $cat) {
                 $cat->set_visible($this->is_visible());
@@ -1834,7 +1834,7 @@ 
      * @param string $name_mask search string
      * @return array category objects matching the search criterium
      */
-    public function find_category($name_mask,$allcat)
+    public function find_category($name_mask, $allcat)
     {
         $foundcats = array();
         foreach ($allcat as $search_cat) {
@@ -1877,9 +1877,9 @@ 
                 }
             }
 
-            $link_to_lock= $this->get_links();
+            $link_to_lock = $this->get_links();
             if (!empty($link_to_lock)) {
-                foreach ($link_to_lock as $item ) {
+                foreach ($link_to_lock as $item) {
                     $item->lock($locked);
                 }
             }
@@ -1968,7 +1968,7 @@ 
                 return [
                     'badge_link' => Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2002,7 +2002,7 @@ 
             $fileWasGenerated = $certificate_obj->html_file_is_generated();
 
             if (!empty($fileWasGenerated)) {
-                $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
+                $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$my_certificate['id'];
 
                 $certificates = Display::url(
                     Display::returnFontAwesomeIcon('download').' '.get_lang('DownloadCertificate'),
@@ -2025,7 +2025,7 @@ 
 
                 $hideExportLink = api_get_setting('hide_certificate_export_link');
                 $hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
-                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true') ) {
+                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true')) {
                     $exportToPDF = null;
                 }
 
@@ -2038,7 +2038,7 @@ 
                 if ($skillToolEnabled && $userHasSkills) {
                     $html['badge_link'] = Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2098,7 +2098,7 @@ 
                     $certificate_obj = new Certificate($value_certificate['id']);
                     $certificate_obj->generate(array('hide_print_button' => true));
                     if ($certificate_obj->html_file_is_generated()) {
-                        $certificate_path_list[]= $certificate_obj->html_file;
+                        $certificate_path_list[] = $certificate_obj->html_file;
                     }
                 }
             }

Braces +1 added lines, -1 removed lines

@@ -1179,7 +1179,7 @@
                             cu.status = '.COURSEMANAGER.'
                     )';
             }
-        }elseif (api_is_platform_admin()) {
+        } elseif (api_is_platform_admin()) {
             if (isset($session_id) && $session_id!=0) {
                 $sql.=' AND session_id='.intval($session_id);
             } else {

Doc Comments +1 added lines, -1 removed lines

@@ -1545,7 +1545,7 @@
      * Retrieve all categories inside a course independent category
      * that should be visible to a student.
      * @param integer $cat_id parent category
-     * @param $stud_id student id
+     * @param integer $stud_id student id
      * @param $cats optional: if defined, the categories will be added to this array
      */
     public function get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array())

main/gradebook/lib/be/attendancelink.class.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
             }
 		} else {
             // all students -> get average
-            $students = array();  // user list, needed to make sure we only
+            $students = array(); // user list, needed to make sure we only
             // take first attempts into account
             $rescount = 0;
             $sum = 0;
@@ -239,7 +239,7 @@ 
 		$this->get_attendance_data();
 		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
 		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+		if (isset($attendance_qualify_title) && $attendance_qualify_title != '') {
 			return $this->attendance_data['attendance_qualify_title'];
 		} else {
 			return $attendance_title;
@@ -279,7 +279,7 @@ 
 		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
 		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
+		$row = Database::fetch_array($result, 'ASSOC');
 		$attendance_id = $row['id'];
 		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
 

Indentation +202 added lines, -202 removed lines

@@ -8,48 +8,48 @@ 
  */
 class AttendanceLink extends AbstractLink
 {
-	private $attendance_table = null;
-	private $itemprop_table = null;
+    private $attendance_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_ATTENDANCE);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_ATTENDANCE);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('Attendance');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('Attendance');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of attendances that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 * @todo seems to be depracated
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+    /**
+     * Generate an array of attendances that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     * @todo seems to be depracated
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
 				FROM '.$this->get_attendance_table().' att
 				WHERE
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@ 
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
 					)
 				AND att.session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@ 
             }
         }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
+    /**
+     * Generate an array of all attendances available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
     public function get_all_links()
     {
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@ 
         $my_cats = isset($cats) ? $cats : null;
 
         return $my_cats;
-	}
+    }
 
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
 				WHERE
 					session_id = $session_id AND
 					c_id = '.$this->course_id.' AND
 					attendance_id = '".intval($this->get_ref_id())."'";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
 
-		return $number[0] != 0;
-	}
+        return $number[0] != 0;
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
 
-		// get attendance qualify max
-		$sql = 'SELECT att.attendance_qualify_max
+        // get attendance qualify max
+        $sql = 'SELECT att.attendance_qualify_max
 		        FROM '.$this->get_attendance_table().' att
   				WHERE
   					att.c_id = '.$this->course_id.' AND
   					att.id = '.intval($this->get_ref_id()).' AND
   					att.session_id='.intval($session_id).'';
-		$query = Database::query($sql);
-		$attendance = Database::fetch_array($query, 'ASSOC');
+        $query = Database::query($sql);
+        $attendance = Database::fetch_array($query, 'ASSOC');
 
-		// Get results
-		$sql = 'SELECT *
+        // Get results
+        $sql = 'SELECT *
 		        FROM '.$tbl_attendance_result.'
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 return array(
                     $data['score'],
@@ -162,7 +162,7 @@ 
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
                 return array(0, $attendance['attendance_qualify_max']);
             }
-		} else {
+        } else {
             // all students -> get average
             $students = array();  // user list, needed to make sure we only
             // take first attempts into account
@@ -171,144 +171,144 @@ 
             $sumResult = 0;
             $bestResult = 0;
 
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($attendance['attendance_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['score'];
-						$rescount++;
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
-						$sumResult += $data['score'];
-						if ($data['score'] > $bestResult) {
-							$bestResult = $data['score'];
-						}
-						$weight = $attendance['attendance_qualify_max'];
-					}
-				}
-			}
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($attendance['attendance_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['score'];
+                        $rescount++;
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
+                        $sumResult += $data['score'];
+                        if ($data['score'] > $bestResult) {
+                            $bestResult = $data['score'];
+                        }
+                        $weight = $attendance['attendance_qualify_max'];
+                    }
+                }
+            }
 
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult / $rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult / $rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_attendance_table()
-	{
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
-		return $this->attendance_table;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_attendance_table()
+    {
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
+        return $this->attendance_table;
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_results()
+    {
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_attendance_data();
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
-			return $this->attendance_data['attendance_qualify_title'];
-		} else {
-			return $attendance_title;
-		}
-	}
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_attendance_data();
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+            return $this->attendance_data['attendance_qualify_title'];
+        } else {
+            return $attendance_title;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return '';
-	}
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return '';
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
 
-	public function get_link()
-	{
-		//it was extracts the attendance id
-		$session_id = api_get_session_id();
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    public function get_link()
+    {
+        //it was extracts the attendance id
+        $session_id = api_get_session_id();
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
-		$attendance_id = $row['id'];
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result,'ASSOC');
+        $attendance_id = $row['id'];
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * @return array|bool
-	 */
-	private function get_attendance_data()
-	{
-		$tbl_name = $this->get_attendance_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->attendance_data)) {
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    /**
+     * @return array|bool
+     */
+    private function get_attendance_data()
+    {
+        $tbl_name = $this->get_attendance_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->attendance_data)) {
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-			$query = Database::query($sql);
-			$this->attendance_data = Database::fetch_array($query);
-		}
-		return $this->attendance_data;
-	}
+            $query = Database::query($sql);
+            $this->attendance_data = Database::fetch_array($query);
+        }
+        return $this->attendance_data;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_icon_name()
-	{
-		return 'attendance';
-	}
+    /**
+     * @return string
+     */
+    public function get_icon_name()
+    {
+        return 'attendance';
+    }
 }

main/gradebook/lib/be/evallink.class.php

Spacing +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@ 
         $eval = $this->get_evaluation();
         // course/platform admin can go to the view_results page
         if (api_is_allowed_to_edit()) {
-            return 'gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } // students can go to the statistics page (if custom display enabled)
         elseif (ScoreDisplay :: instance()->is_custom()) {
-            return 'gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } else {
             return null;
         }
@@ -176,8 +176,8 @@ 
                 $eval = new Evaluation();
                 $eval->set_category_id(-1);
                 $eval->set_date(api_get_utc_datetime()); // these values will be changed
-                $eval->set_weight(0);    //   when the link setter
-                $eval->set_visible(0);   //     is called
+                $eval->set_weight(0); //   when the link setter
+                $eval->set_visible(0); //     is called
                 $eval->set_id(-1); // a 'real' id will be set when eval is added to db
                 $eval->set_user_id($this->get_user_id());
                 $eval->set_course_code($this->get_course_code());

Doc Comments +9 added lines

@@ -117,6 +117,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     public function set_name($name)
     {
         if ($this->is_valid_link()) {
@@ -124,6 +127,9 @@ 
         }
     }
 
+    /**
+     * @param string $description
+     */
     public function set_description($description)
     {
         if ($this->is_valid_link()) {
@@ -131,6 +137,9 @@ 
         }
     }
 
+    /**
+     * @param integer $max
+     */
     public function set_max($max)
     {
         if ($this->is_valid_link()) {

main/gradebook/lib/be/surveylink.class.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 			$links[] = array(
 				$data['survey_id'],
 				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
+					$data['code'].': '.self::html_to_text($data['title']),
 					80
 				)
 			);
@@ -121,7 +121,7 @@ 
 	/**
 	 * Has anyone done this survey yet?
 	 */
-	public function has_results($stud_id=null)
+	public function has_results($stud_id = null)
 	{
 		$ref_id = intval($this->get_ref_id());
 		$session_id = api_get_session_id();

Indentation +246 added lines, -246 removed lines

@@ -8,98 +8,98 @@ 
  */
 class SurveyLink extends AbstractLink
 {
-	private $survey_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_SURVEY);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_survey_data();
+    private $survey_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_SURVEY);
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_survey_data();
 		
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
-	}
-
-	public function get_description()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['subtitle'];
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Survey');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	/**
-	 * Generates an array of all surveys available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_all_links() : course code not set');
-		}
-		$tbl_survey = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		$course_id = api_get_course_int_id();
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
+    }
+
+    public function get_description()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['subtitle'];
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Survey');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    /**
+     * Generates an array of all surveys available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_all_links() : course code not set');
+        }
+        $tbl_survey = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        $course_id = api_get_course_int_id();
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
-					80
-				)
-			);
-		}
-
-		return isset($links) ? $links : null;
-	}
-
-	/**
-	 * Generates an array of surveys that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT survey_id, title, code
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str(
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
+                    80
+                )
+            );
+        }
+
+        return isset($links) ? $links : null;
+    }
+
+    /**
+     * Generates an array of surveys that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT survey_id, title, code
     			FROM '.$this->get_survey_table().' AS srv
 				WHERE survey_id NOT IN
 					(
@@ -110,28 +110,28 @@ 
 					)
 					AND srv.session_id = '.api_get_session_id();
 
-		$result = Database::query($sql);
-
-		$links = array();
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Has anyone done this survey yet?
-	 */
-	public function has_results($stud_id=null)
-	{
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-		$sql = "SELECT
+        $result = Database::query($sql);
+
+        $links = array();
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
+            );
+        }
+        return $links;
+    }
+
+    /**
+     * Has anyone done this survey yet?
+     */
+    public function has_results($stud_id=null)
+    {
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $sql = "SELECT
 				COUNT(i.answered)
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -141,30 +141,30 @@ 
 					s.survey_id = $ref_id AND
 					i.session_id = $session_id";
 
-		$sql_result = Database::query($sql);
-		$data = Database::fetch_array($sql_result);
+        $sql_result = Database::query($sql);
+        $data = Database::fetch_array($sql_result);
 
-		return ($data[0] != 0);
-	}
+        return ($data[0] != 0);
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		// Note: Max score is assumed to be always 1 for surveys,
-		// only student's participation is to be taken into account.
-		$max_score = 1;
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        // Note: Max score is assumed to be always 1 for surveys,
+        // only student's participation is to be taken into account.
+        $max_score = 1;
 
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 
-		$get_individual_score = !is_null($stud_id);
+        $get_individual_score = !is_null($stud_id);
 
-		$sql = "SELECT i.answered
+        $sql = "SELECT i.answered
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i
 				ON s.code = i.survey_code
@@ -175,131 +175,131 @@ 
 					i.session_id = $session_id
 				";
 
-		if ($get_individual_score) {
-			$sql .= ' AND i.user = '.intval($stud_id);
-		}
-
-		$sql_result = Database::query($sql);
-
-		if ($get_individual_score) {
-			// for 1 student
-			if ($data = Database::fetch_array($sql_result)) {
-				return array($data['answered'] ? $max_score : 0, $max_score);
-			}
-			return array(0, $max_score);
-		} else {
-			// for all the students -> get average
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			while ($data = Database::fetch_array($sql_result)) {
-				$sum += $data['answered'] ? $max_score : 0;
-				$rescount++;
-				if ($data['answered'] > $bestResult) {
-					$bestResult = $data['answered'];
-					$weight = $assignment['qualification'];
-				}
-			}
-			$sum = $sum / $max_score;
-
-			if ($rescount == 0) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $rescount);
-					break;
-				case 'average':
-					return array($sum, $rescount);
-					break;
-				case 'ranking':
-					return null;
-					break;
-				default:
-					return array($sum, $rescount);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the surveys
-	 */
-	private function get_survey_table()
-	{
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
-		return $this->survey_table;
-	}
-
-	/**
-	 * Check if this still links to a survey
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
+        if ($get_individual_score) {
+            $sql .= ' AND i.user = '.intval($stud_id);
+        }
+
+        $sql_result = Database::query($sql);
+
+        if ($get_individual_score) {
+            // for 1 student
+            if ($data = Database::fetch_array($sql_result)) {
+                return array($data['answered'] ? $max_score : 0, $max_score);
+            }
+            return array(0, $max_score);
+        } else {
+            // for all the students -> get average
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            while ($data = Database::fetch_array($sql_result)) {
+                $sum += $data['answered'] ? $max_score : 0;
+                $rescount++;
+                if ($data['answered'] > $bestResult) {
+                    $bestResult = $data['answered'];
+                    $weight = $assignment['qualification'];
+                }
+            }
+            $sum = $sum / $max_score;
+
+            if ($rescount == 0) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $rescount);
+                    break;
+                case 'average':
+                    return array($sum, $rescount);
+                    break;
+                case 'ranking':
+                    return null;
+                    break;
+                default:
+                    return array($sum, $rescount);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the surveys
+     */
+    private function get_survey_table()
+    {
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
+        return $this->survey_table;
+    }
+
+    /**
+     * Check if this still links to a survey
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
         		 WHERE
         		 	c_id = '.$this->course_id.' AND
         		 	survey_id = '.intval($this->get_ref_id()).' AND
         		 	session_id='.intval($session_id).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
-			$tbl_name = $this->get_survey_table();
-			$session_id = api_get_session_id();
-			if ($tbl_name != '') {
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
+            $tbl_name = $this->get_survey_table();
+            $session_id = api_get_session_id();
+            if ($tbl_name != '') {
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
     					WHERE
     						c_id = '.$this->course_id.' AND
     						survey_id = '.intval($this->get_ref_id()).' AND
     						session_id = '.intval($session_id).' ';
-				$result = Database::query($sql);
-				$row = Database::fetch_array($result, 'ASSOC');
-				$survey_id = $row['survey_id'];
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
-			}
-		}
-		return null;
-	}
-
-	private function get_survey_data()
-	{
-		$tbl_name = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->survey_data)) {
-			$sql = 'SELECT * FROM '.$tbl_name.'
+                $result = Database::query($sql);
+                $row = Database::fetch_array($result, 'ASSOC');
+                $survey_id = $row['survey_id'];
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
+            }
+        }
+        return null;
+    }
+
+    private function get_survey_data()
+    {
+        $tbl_name = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->survey_data)) {
+            $sql = 'SELECT * FROM '.$tbl_name.'
 					WHERE
 						c_id = '.$this->course_id.' AND
 						survey_id = '.intval($this->get_ref_id()).' AND
 						session_id='.intval($session_id).'';
-			$query = Database::query($sql);
-			$this->survey_data = Database::fetch_array($query);
-		}
-		return $this->survey_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'survey';
-	}
-
-	private static function html_to_text($string)
-	{
-		return strip_tags($string);
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
-	}
+            $query = Database::query($sql);
+            $this->survey_data = Database::fetch_array($query);
+        }
+        return $this->survey_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'survey';
+    }
+
+    private static function html_to_text($string)
+    {
+        return strip_tags($string);
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
+    }
 }

main/gradebook/lib/be/linkfactory.class.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @param string $name_mask search string
      * @return array link objects matching the search criterium
      */
-    public function find_links($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         return AbstractLink::find_links($name_mask, $selectcat);
     }
@@ -98,7 +98,7 @@ 
     public static function get_all_types()
     {
         //LINK_DROPBOX,
-        return array (
+        return array(
             LINK_EXERCISE,
             //LINK_DROPBOX,
             LINK_HOTPOTATOES,

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
     /**
      * Return an array of all known link types
-     * @return array
+     * @return integer[]
      */
     public static function get_all_types()
     {

main/gradebook/lib/be/result.class.php

Spacing +29 added lines, -29 removed lines

@@ -90,23 +90,23 @@ 
         if (is_null($id) && is_null($user_id) && !is_null($evaluation_id)) {
             // Verified_if_exist_evaluation
             $sql = 'SELECT COUNT(*) AS count
-                    FROM ' . $tbl_grade_results . '
-                    WHERE evaluation_id="' . Database::escape_string($evaluation_id) . '";';
+                    FROM ' . $tbl_grade_results.'
+                    WHERE evaluation_id="' . Database::escape_string($evaluation_id).'";';
             $result = Database::query($sql);
             $existEvaluation = Database::result($result, 0, 0);
 
             if ($existEvaluation != 0) {
                 if ($sessionId) {
                     $sql = 'SELECT c_id, user_id as user_id, status
-                            FROM ' . $tbl_session_rel_course_user . '
+                            FROM ' . $tbl_session_rel_course_user.'
 							WHERE
 							    status= 0 AND
-							    c_id = "' . api_get_course_int_id() . '" AND
+							    c_id = "' . api_get_course_int_id().'" AND
 							    session_id = ' . $sessionId;
                 } else {
                     $sql = 'SELECT c_id, user_id, status
-                            FROM ' . $tbl_course_rel_course . '
-                            WHERE status ="' . STUDENT . '" AND c_id = "' . api_get_course_int_id() . '" ';
+                            FROM ' . $tbl_course_rel_course.'
+                            WHERE status ="' . STUDENT.'" AND c_id = "'.api_get_course_int_id().'" ';
                 }
 
                 $res_course_rel_user = Database::query($sql);
@@ -116,15 +116,15 @@ 
                 $current_date = api_get_utc_datetime();
                 for ($i = 0; $i < count($list_user_course_list); $i++) {
                     $sql_verified = 'SELECT COUNT(*) AS count
-                                    FROM ' . $tbl_grade_results . '
+                                    FROM ' . $tbl_grade_results.'
                                     WHERE
-                                        user_id="' . intval($list_user_course_list[$i]['user_id']) . '" AND
-                                        evaluation_id="' . intval($evaluation_id) . '";';
+                                        user_id="' . intval($list_user_course_list[$i]['user_id']).'" AND
+                                        evaluation_id="' . intval($evaluation_id).'";';
                     $res_verified = Database::query($sql_verified);
                     $info_verified = Database::result($res_verified, 0, 0);
                     if ($info_verified == 0) {
-                        $sql_insert = 'INSERT INTO ' . $tbl_grade_results . '(user_id,evaluation_id,created_at,score)
-									   VALUES ("' . intval($list_user_course_list[$i]['user_id']) . '","' . intval($evaluation_id) . '","' . $current_date . '",0);';
+                        $sql_insert = 'INSERT INTO '.$tbl_grade_results.'(user_id,evaluation_id,created_at,score)
+									   VALUES ("' . intval($list_user_course_list[$i]['user_id']).'","'.intval($evaluation_id).'","'.$current_date.'",0);';
                         Database::query($sql_insert);
                     }
                 }
@@ -148,16 +148,16 @@ 
 
         $paramcount = 0;
         if (!empty($id)) {
-            $sql.= ' WHERE gr.id = ' . intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE gr.id = '.intval($id);
+            $paramcount++;
         }
         if (!empty($user_id)) {
             if ($paramcount != 0)
                 $sql .= ' AND';
             else
                 $sql .= ' WHERE';
-            $sql .= ' gr.user_id = ' . intval($user_id);
-            $paramcount ++;
+            $sql .= ' gr.user_id = '.intval($user_id);
+            $paramcount++;
         }
         if (!empty($evaluation_id)) {
             if ($paramcount != 0) {
@@ -165,8 +165,8 @@ 
             } else {
                 $sql .= ' WHERE';
             }
-            $sql .= ' gr.evaluation_id = ' . intval($evaluation_id);
-            $paramcount ++;
+            $sql .= ' gr.evaluation_id = '.intval($evaluation_id);
+            $paramcount++;
         }
         $sql .= ' ORDER BY u.lastname, u.firstname';
         $result = Database::query($sql);
@@ -191,17 +191,17 @@ 
     {
         if (isset($this->user_id) && isset($this->evaluation)) {
             $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-            $sql = "INSERT INTO " . $tbl_grade_results
+            $sql = "INSERT INTO ".$tbl_grade_results
                 . " (user_id, evaluation_id,
 					created_at";
             if (isset($this->score)) {
                 $sql .= ",score";
             }
             $sql .= ") VALUES
-					(" . (int) $this->get_user_id() . ", " . (int) $this->get_evaluation_id()
-                . ", '" . $this->get_date() . "' ";
+					(" . (int) $this->get_user_id().", ".(int) $this->get_evaluation_id()
+                . ", '".$this->get_date()."' ";
             if (isset($this->score)) {
-                $sql .= ", " . $this->get_score();
+                $sql .= ", ".$this->get_score();
             }
             $sql .= ")";
             Database::query($sql);
@@ -222,16 +222,16 @@ 
             $arr_result = $result->load(null, $userid, $evaluationid);
             $arr = get_object_vars($arr_result[0]);
 
-            $sql = 'INSERT INTO ' . $tbl_grade_results_log
+            $sql = 'INSERT INTO '.$tbl_grade_results_log
                 . ' (id_result,user_id, evaluation_id,created_at';
             if (isset($arr['score'])) {
                 $sql .= ',score';
             }
             $sql .= ') VALUES
-					(' . (int) $arr['id'] . ',' . (int) $arr['user_id'] . ', ' . (int) $arr['evaluation']
-                . ", '" . api_get_utc_datetime() . "'";
+					(' . (int) $arr['id'].','.(int) $arr['user_id'].', '.(int) $arr['evaluation']
+                . ", '".api_get_utc_datetime()."'";
             if (isset($arr['score'])) {
-                $sql .= ', ' . $arr['score'];
+                $sql .= ', '.$arr['score'];
             }
             $sql .= ')';
 
@@ -247,16 +247,16 @@ 
     public function save()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'UPDATE ' . $tbl_grade_results . '
+        $sql = 'UPDATE '.$tbl_grade_results.'
                 SET user_id = ' . $this->get_user_id()
-            . ', evaluation_id = ' . $this->get_evaluation_id()
+            . ', evaluation_id = '.$this->get_evaluation_id()
             . ', score = ';
         if (isset($this->score)) {
             $sql .= $this->get_score();
         } else {
             $sql .= 'null';
         }
-        $sql .= ' WHERE id = ' . $this->id;
+        $sql .= ' WHERE id = '.$this->id;
         // no need to update creation date
         Database::query($sql);
     }
@@ -267,7 +267,7 @@ 
     public function delete()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'DELETE FROM ' . $tbl_grade_results . ' WHERE id = ' . $this->id;
+        $sql = 'DELETE FROM '.$tbl_grade_results.' WHERE id = '.$this->id;
         Database::query($sql);
     }
 }

Braces +5 added lines, -4 removed lines

@@ -152,10 +152,11 @@
             $paramcount ++;
         }
         if (!empty($user_id)) {
-            if ($paramcount != 0)
-                $sql .= ' AND';
-            else
-                $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                            $sql .= ' AND';
+            } else {
+                            $sql .= ' WHERE';
+            }
             $sql .= ' gr.user_id = ' . intval($user_id);
             $paramcount ++;
         }

main/gradebook/lib/be/evaluation.class.php

Spacing +27 added lines, -27 removed lines

@@ -223,36 +223,36 @@ 
 		$paramcount = 0;
 
 		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
+			$sql .= ' WHERE id = '.intval($id);
+			$paramcount++;
 		}
 
 		if (isset ($user_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($category_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($visible)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($locked)) {
@@ -278,7 +278,7 @@ 
 		$alleval = array();
 		if (Database::num_rows($result)) {
 			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
+				$eval = new Evaluation();
 				$eval->set_id($data['id']);
 				$eval->set_name($data['name']);
 				$eval->set_description($data['description']);
@@ -363,7 +363,7 @@ 
 			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
 			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
 			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
+			$dateobject = $eval->load($idevaluation, null, null, null, null);
 			$arreval = get_object_vars($dateobject[0]);
 			if (!empty($arreval['id'])) {
 				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
@@ -397,7 +397,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,17 +468,17 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}
 
 		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
+			$sql .= ' AND category_id is null';
 		} else {
-			$sql.= ' AND category_id = '.intval($parent);
+			$sql .= ' AND category_id = '.intval($parent);
 		}
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return $number[0] != 0;
 	}
@@ -494,7 +494,7 @@ 
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return ($number[0] != 0);
 	}
@@ -544,7 +544,7 @@ 
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
-                $results  = null;
+                $results = null;
             }
 			if (empty($results)) {
 				$results = Result::load(null, $stud_id, $this->id);
@@ -570,7 +570,7 @@ 
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
-                $allResults  = null;
+                $allResults = null;
             }
 			if (empty($allResults)) {
 				$allResults = Result::load(null, null, $this->id);
@@ -602,7 +602,7 @@ 
 					return array($bestResult, $weight);
 					break;
 				case 'average':
-					return array($sumResult/$count, $weight);
+					return array($sumResult / $count, $weight);
 					break;
 				case 'ranking':
                     $students = array();
@@ -640,17 +640,17 @@ 
 		$targets[] = $root;
 
 		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
+			$crscats = Category::load(null, null, $this->course_code, 0);
 			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+				$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+				$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 			}
 		}
 
-		$indcats = Category::load(null,$user,0,0);
+		$indcats = Category::load(null, $user, 0, 0);
 		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 
 		return $targets;
@@ -661,10 +661,10 @@ 
 	 */
 	private function add_target_subcategories($targets, $level, $catid)
 	{
-		$subcats = Category::load(null,null,null,$catid);
+		$subcats = Category::load(null, null, null, $catid);
 		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 		return $targets;
 	}
@@ -743,7 +743,7 @@ 
 	 * @return array evaluation objects matching the search criterium
 	 * @todo can be written more efficiently using a new (but very complex) sql query
 	 */
-	public function find_evaluations($name_mask,$selectcat)
+	public function find_evaluations($name_mask, $selectcat)
 	{
 		$rootcat = Category::load($selectcat);
 		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);

Braces +27 added lines, -12 removed lines

@@ -228,36 +228,51 @@ 
 		}
 
 		if (isset ($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' user_id = '.intval($user_id);
 			$paramcount ++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
 			$paramcount ++;
 		}
 
 		if (isset ($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' category_id = '.intval($category_id);
 			$paramcount ++;
 		}
 
 		if (isset ($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' visible = '.intval($visible);
 			$paramcount ++;
 		}
 
 		if (isset ($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' locked = '.intval($locked);
 		}
 
@@ -397,7 +412,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,7 +483,7 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}
 

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 
 
 	/**
-	 * @param array $result
+	 * @param Doctrine\DBAL\Driver\Statement|null $result
 	 * @return array
 	 */
 	private static function create_evaluation_objects_from_sql_result($result)

Indentation +745 added lines, -745 removed lines

@@ -9,365 +9,365 @@ 
  */
 class Evaluation implements GradebookItem
 {
-	private $id;
-	private $name;
-	private $description;
-	private $user_id;
-	private $course_code;
-	/** @var Category */
-	private $category;
-	private $created_at;
-	private $weight;
-	private $eval_max;
-	private $visible;
-	private $sessionId;
-	public $studentList;
-
-	/**
-	 * Construct
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @return Category
-	 */
-	public function getCategory()
-	{
-		return $this->category;
-	}
-
-	/**
-	 * @param Category $category
-	 */
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_category_id()
-	{
-		return $this->category->get_id();
-	}
-
-	/**
-	 * @param int $category_id
-	 */
-	public function set_category_id($category_id)
-	{
-		$categories = Category::load($category_id);
-		if (isset($categories[0])) {
-			$this->setCategory($categories[0]);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_id()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_user_id()
-	{
-		return $this->user_id;
-	}
-
-	public function get_course_code()
-	{
-		return $this->course_code;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSessionId()
-	{
-		return $this->sessionId;
-	}
-
-	/**
-	 * @param int $sessionId
-	 */
-	public function setSessionId($sessionId)
-	{
-		$this->sessionId = intval($sessionId);
-	}
-
-	public function get_date()
-	{
-		return $this->created_at;
-	}
-
-	public function get_weight()
-	{
-		return $this->weight;
-	}
-
-	public function get_max()
-	{
-		return $this->eval_max;
-	}
-
-	public function get_type()
-	{
-		return $this->type;
-	}
-
-	public function is_visible()
-	{
-		return $this->visible;
-	}
-
-	public function get_locked()
-	{
-		return $this->locked;
-	}
-
-	public function is_locked()
-	{
-		return isset($this->locked) && $this->locked == 1 ? true : false;
-	}
-
-	public function set_id($id)
-	{
-		$this->id = $id;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_user_id($user_id)
-	{
-		$this->user_id = $user_id;
-	}
-
-	public function set_course_code($course_code)
-	{
-		$this->course_code = $course_code;
-	}
-
-	public function set_date($date)
-	{
-		$this->created_at = $date;
-	}
-
-	public function set_weight($weight)
-	{
-		$this->weight = $weight;
-	}
-
-	public function set_max($max)
-	{
-		$this->eval_max = $max;
-	}
-
-	public function set_visible($visible)
-	{
-		$this->visible = $visible;
-	}
-
-	public function set_type($type)
-	{
-		$this->type = $type;
-	}
-
-	public function set_locked($locked)
-	{
-		$this->locked = $locked;
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param int $id evaluation id
-	 * @param int $user_id user id (evaluation owner)
-	 * @param string $course_code course code
-	 * @param int $category_id parent category
-	 * @param integer $visible visible
-	 */
-	public static function load(
-		$id = null,
-		$user_id = null,
-		$course_code = null,
-		$category_id = null,
-		$visible = null,
-		$locked = null
-	) {
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
-		$paramcount = 0;
-
-		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
-		}
-
-		if (isset($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
-		}
-
-		if (isset($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
-		}
-
-		if (isset($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
-		}
-
-		if (isset($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
-		}
-
-		if (isset($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' locked = '.intval($locked);
-		}
-
-		$result = Database::query($sql);
-		$allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $allEval;
-	}
-
-	/**
-	 * @param array $result
-	 * @return array
-	 */
-	private static function create_evaluation_objects_from_sql_result($result)
-	{
-		$alleval = array();
-		if (Database::num_rows($result)) {
-			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
-				$eval->set_id($data['id']);
-				$eval->set_name($data['name']);
-				$eval->set_description($data['description']);
-				$eval->set_user_id($data['user_id']);
-				$eval->set_course_code($data['course_code']);
-				$eval->set_category_id($data['category_id']);
-				$eval->set_date(api_get_local_time($data['created_at']));
-				$eval->set_weight($data['weight']);
-				$eval->set_max($data['max']);
-				$eval->set_visible($data['visible']);
-				$eval->set_type($data['type']);
-				$eval->set_locked($data['locked']);
-				$eval->setSessionId(api_get_session_id());
-
-				$alleval[] = $eval;
-			}
-		}
-
-		return $alleval;
-	}
-
-	/**
-	 * Insert this evaluation into the database
-	 */
+    private $id;
+    private $name;
+    private $description;
+    private $user_id;
+    private $course_code;
+    /** @var Category */
+    private $category;
+    private $created_at;
+    private $weight;
+    private $eval_max;
+    private $visible;
+    private $sessionId;
+    public $studentList;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $category
+     */
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
+
+    /**
+     * @return int
+     */
+    public function get_category_id()
+    {
+        return $this->category->get_id();
+    }
+
+    /**
+     * @param int $category_id
+     */
+    public function set_category_id($category_id)
+    {
+        $categories = Category::load($category_id);
+        if (isset($categories[0])) {
+            $this->setCategory($categories[0]);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_user_id()
+    {
+        return $this->user_id;
+    }
+
+    public function get_course_code()
+    {
+        return $this->course_code;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * @param int $sessionId
+     */
+    public function setSessionId($sessionId)
+    {
+        $this->sessionId = intval($sessionId);
+    }
+
+    public function get_date()
+    {
+        return $this->created_at;
+    }
+
+    public function get_weight()
+    {
+        return $this->weight;
+    }
+
+    public function get_max()
+    {
+        return $this->eval_max;
+    }
+
+    public function get_type()
+    {
+        return $this->type;
+    }
+
+    public function is_visible()
+    {
+        return $this->visible;
+    }
+
+    public function get_locked()
+    {
+        return $this->locked;
+    }
+
+    public function is_locked()
+    {
+        return isset($this->locked) && $this->locked == 1 ? true : false;
+    }
+
+    public function set_id($id)
+    {
+        $this->id = $id;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_user_id($user_id)
+    {
+        $this->user_id = $user_id;
+    }
+
+    public function set_course_code($course_code)
+    {
+        $this->course_code = $course_code;
+    }
+
+    public function set_date($date)
+    {
+        $this->created_at = $date;
+    }
+
+    public function set_weight($weight)
+    {
+        $this->weight = $weight;
+    }
+
+    public function set_max($max)
+    {
+        $this->eval_max = $max;
+    }
+
+    public function set_visible($visible)
+    {
+        $this->visible = $visible;
+    }
+
+    public function set_type($type)
+    {
+        $this->type = $type;
+    }
+
+    public function set_locked($locked)
+    {
+        $this->locked = $locked;
+    }
+
+    /**
+     * Retrieve evaluations and return them as an array of Evaluation objects
+     * @param int $id evaluation id
+     * @param int $user_id user id (evaluation owner)
+     * @param string $course_code course code
+     * @param int $category_id parent category
+     * @param integer $visible visible
+     */
+    public static function load(
+        $id = null,
+        $user_id = null,
+        $course_code = null,
+        $category_id = null,
+        $visible = null,
+        $locked = null
+    ) {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations;
+        $paramcount = 0;
+
+        if (isset ($id)) {
+            $sql.= ' WHERE id = '.intval($id);
+            $paramcount ++;
+        }
+
+        if (isset($user_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' user_id = '.intval($user_id);
+            $paramcount ++;
+        }
+
+        if (isset($course_code) && $course_code <> '-1') {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= " course_code = '".Database::escape_string($course_code)."'";
+            $paramcount ++;
+        }
+
+        if (isset($category_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' category_id = '.intval($category_id);
+            $paramcount ++;
+        }
+
+        if (isset($visible)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' visible = '.intval($visible);
+            $paramcount ++;
+        }
+
+        if (isset($locked)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' locked = '.intval($locked);
+        }
+
+        $result = Database::query($sql);
+        $allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $allEval;
+    }
+
+    /**
+     * @param array $result
+     * @return array
+     */
+    private static function create_evaluation_objects_from_sql_result($result)
+    {
+        $alleval = array();
+        if (Database::num_rows($result)) {
+            while ($data = Database::fetch_array($result)) {
+                $eval= new Evaluation();
+                $eval->set_id($data['id']);
+                $eval->set_name($data['name']);
+                $eval->set_description($data['description']);
+                $eval->set_user_id($data['user_id']);
+                $eval->set_course_code($data['course_code']);
+                $eval->set_category_id($data['category_id']);
+                $eval->set_date(api_get_local_time($data['created_at']));
+                $eval->set_weight($data['weight']);
+                $eval->set_max($data['max']);
+                $eval->set_visible($data['visible']);
+                $eval->set_type($data['type']);
+                $eval->set_locked($data['locked']);
+                $eval->setSessionId(api_get_session_id());
+
+                $alleval[] = $eval;
+            }
+        }
+
+        return $alleval;
+    }
+
+    /**
+     * Insert this evaluation into the database
+     */
     public function add()
-	{
-		if (isset($this->name) &&
-			isset($this->user_id) &&
-			isset($this->weight) &&
-			isset ($this->eval_max) &&
-			isset($this->visible)
-		) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-
-			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-				.' (name, user_id, weight, max, visible';
-			if (isset($this->description)) {
-				$sql .= ',description';
-			}
-			if (isset($this->course_code)) {
-				$sql .= ', course_code';
-			}
-			if (isset($this->category)) {
-				$sql .= ', category_id';
-			}
-			$sql .= ', created_at';
-			$sql .= ',type';
-			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
-				.','.intval($this->get_user_id())
-				.','.floatval($this->get_weight())
-				.','.intval($this->get_max())
-				.','.intval($this->is_visible());
-			if (isset($this->description)) {
-				$sql .= ",'".Database::escape_string($this->get_description())."'";
-			}
-			if (isset($this->course_code)) {
-				$sql .= ",'".Database::escape_string($this->get_course_code())."'";
-			}
-			if (isset($this->category)) {
-				$sql .= ','.intval($this->get_category_id());
-			}
-			if (empty($this->type)) {
-				$this->type = 'evaluation';
-			}
-			$sql .= ", '".api_get_utc_datetime()."'";
-			$sql .= ',\''.Database::escape_string($this->type).'\'';
-			$sql .= ")";
-
-			Database::query($sql);
-			$this->set_id(Database::insert_id());
-		} else {
-			die('Error in Evaluation add: required field empty');
-		}
-	}
-
-	/**
-	 * @param int $idevaluation
-	 */
-	public function add_evaluation_log($idevaluation)
-	{
-		if (!empty($idevaluation)) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
-			$arreval = get_object_vars($dateobject[0]);
-			if (!empty($arreval['id'])) {
-				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
+    {
+        if (isset($this->name) &&
+            isset($this->user_id) &&
+            isset($this->weight) &&
+            isset ($this->eval_max) &&
+            isset($this->visible)
+        ) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+
+            $sql = 'INSERT INTO '.$tbl_grade_evaluations
+                .' (name, user_id, weight, max, visible';
+            if (isset($this->description)) {
+                $sql .= ',description';
+            }
+            if (isset($this->course_code)) {
+                $sql .= ', course_code';
+            }
+            if (isset($this->category)) {
+                $sql .= ', category_id';
+            }
+            $sql .= ', created_at';
+            $sql .= ',type';
+            $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
+                .','.intval($this->get_user_id())
+                .','.floatval($this->get_weight())
+                .','.intval($this->get_max())
+                .','.intval($this->is_visible());
+            if (isset($this->description)) {
+                $sql .= ",'".Database::escape_string($this->get_description())."'";
+            }
+            if (isset($this->course_code)) {
+                $sql .= ",'".Database::escape_string($this->get_course_code())."'";
+            }
+            if (isset($this->category)) {
+                $sql .= ','.intval($this->get_category_id());
+            }
+            if (empty($this->type)) {
+                $this->type = 'evaluation';
+            }
+            $sql .= ", '".api_get_utc_datetime()."'";
+            $sql .= ',\''.Database::escape_string($this->type).'\'';
+            $sql .= ")";
+
+            Database::query($sql);
+            $this->set_id(Database::insert_id());
+        } else {
+            die('Error in Evaluation add: required field empty');
+        }
+    }
+
+    /**
+     * @param int $idevaluation
+     */
+    public function add_evaluation_log($idevaluation)
+    {
+        if (!empty($idevaluation)) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+            $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
+            $eval = new Evaluation();
+            $dateobject = $eval->load($idevaluation,null,null,null,null);
+            $arreval = get_object_vars($dateobject[0]);
+            if (!empty($arreval['id'])) {
+                $sql = 'SELECT weight from '.$tbl_grade_evaluations.'
                         WHERE id='.$arreval['id'];
                 $rs = Database::query($sql);
                 $row_old_weight = Database::fetch_array($rs, 'ASSOC');
@@ -383,426 +383,426 @@ 
                     'user_id_log' => api_get_user_id()
                 ];
                 Database::insert($tbl_grade_linkeval_log, $params);
-			}
-		}
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-	public function save()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'UPDATE '.$tbl_grade_evaluations
-			." SET name = '".Database::escape_string($this->get_name())."'"
-			.', description = ';
-		if (isset($this->description)) {
-			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
-			$sql .= 'null';
-		}
-		$sql .= ', user_id = '.intval($this->get_user_id())
-			.', course_code = ';
-		if (isset($this->course_code)) {
-			$sql .= "'".Database::escape_string($this->get_course_code())."'";
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', category_id = ';
-		if (isset($this->category)) {
-			$sql .= intval($this->get_category_id());
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
-			.', max = '.intval($this->get_max())
-			.', visible = '.intval($this->is_visible())
-			.' WHERE id = '.intval($this->id);
-		//recorded history
-
-		$eval_log = new Evaluation();
-		$eval_log->add_evaluation_log($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-	public function delete()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-	public function does_name_exist($name, $parent)
-	{
-		if (!isset ($name)) {
-			$name = $this->name;
-			$parent = $this->category;
-		}
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT count(id) AS number'
-			.' FROM '.$tbl_grade_evaluations
-			." WHERE name = '".Database::escape_string($name)."'";
-
-		if (api_is_allowed_to_edit()) {
-			$parent = Category::load($parent);
-			$code = $parent[0]->get_course_code();
-			$courseInfo = api_get_course_info($code);
-			$courseId = $courseInfo['real_id'];
-
-			if (isset($code) && $code != '0') {
-				$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-				$sql .= ' AND user_id IN (
+            }
+        }
+    }
+
+    /**
+     * Update the properties of this evaluation in the database
+     */
+    public function save()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'UPDATE '.$tbl_grade_evaluations
+            ." SET name = '".Database::escape_string($this->get_name())."'"
+            .', description = ';
+        if (isset($this->description)) {
+            $sql .= "'".Database::escape_string($this->get_description())."'";
+        }else {
+            $sql .= 'null';
+        }
+        $sql .= ', user_id = '.intval($this->get_user_id())
+            .', course_code = ';
+        if (isset($this->course_code)) {
+            $sql .= "'".Database::escape_string($this->get_course_code())."'";
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', category_id = ';
+        if (isset($this->category)) {
+            $sql .= intval($this->get_category_id());
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
+            .', max = '.intval($this->get_max())
+            .', visible = '.intval($this->is_visible())
+            .' WHERE id = '.intval($this->id);
+        //recorded history
+
+        $eval_log = new Evaluation();
+        $eval_log->add_evaluation_log($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation from the database
+     */
+    public function delete()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Check if an evaluation name (with the same parent category) already exists
+     * @param $name name to check (if not given, the name property of this object will be checked)
+     * @param $parent parent category
+     */
+    public function does_name_exist($name, $parent)
+    {
+        if (!isset ($name)) {
+            $name = $this->name;
+            $parent = $this->category;
+        }
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT count(id) AS number'
+            .' FROM '.$tbl_grade_evaluations
+            ." WHERE name = '".Database::escape_string($name)."'";
+
+        if (api_is_allowed_to_edit()) {
+            $parent = Category::load($parent);
+            $code = $parent[0]->get_course_code();
+            $courseInfo = api_get_course_info($code);
+            $courseId = $courseInfo['real_id'];
+
+            if (isset($code) && $code != '0') {
+                $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                $sql .= ' AND user_id IN (
 					 SELECT user_id FROM '.$main_course_user_table.'
 					 WHERE
 						c_id = '.$courseId.' AND
 						status = '.COURSEMANAGER.'
 					)';
-			} else {
-				$sql .= ' AND user_id = '.api_get_user_id();
-			}
-
-		}else {
-			$sql .= ' AND user_id = '.api_get_user_id();
-		}
-
-		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
-		} else {
-			$sql.= ' AND category_id = '.intval($parent);
-		}
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return $number[0] != 0;
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-	public function has_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'SELECT count(id) AS number
+            } else {
+                $sql .= ' AND user_id = '.api_get_user_id();
+            }
+
+        }else {
+            $sql .= ' AND user_id = '.api_get_user_id();
+        }
+
+        if (!isset ($parent)) {
+            $sql.= ' AND category_id is null';
+        } else {
+            $sql.= ' AND category_id = '.intval($parent);
+        }
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return $number[0] != 0;
+    }
+
+    /**
+     * Are there any results for this evaluation yet ?
+     * The 'max' property should not be changed then.
+     */
+    public function has_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'SELECT count(id) AS number
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Delete all results for this evaluation
-	 */
-	public function delete_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'DELETE FROM '.$tbl_grade_results.'
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Delete all results for this evaluation
+     */
+    public function delete_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'DELETE FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation and all underlying results.
-	 */
-	public function delete_with_results()
-	{
-		$this->delete_results();
-		$this->delete();
-	}
-
-	/**
-	 * Check if the given score is possible for this evaluation
-	 */
-	public function is_valid_score($score)
-	{
-		return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
-	}
-
-	/**
-	 * Calculate the score of this evaluation
-	 * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
-	 * @param string $type (best, average, ranking)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation and all underlying results.
+     */
+    public function delete_with_results()
+    {
+        $this->delete_results();
+        $this->delete();
+    }
+
+    /**
+     * Check if the given score is possible for this evaluation
+     */
+    public function is_valid_score($score)
+    {
+        return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
+    }
+
+    /**
+     * Calculate the score of this evaluation
+     * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
+     * @param string $type (best, average, ranking)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         $useSession = true;
-		if (isset($stud_id) && empty($type)) {
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
-			$data = Session::read('calc_score');
+        if (isset($stud_id) && empty($type)) {
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
+            $data = Session::read('calc_score');
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
                 $results  = null;
             }
-			if (empty($results)) {
-				$results = Result::load(null, $stud_id, $this->id);
-				Session::write('calc_score', array($key => $results));
-			}
-
-			$score = 0;
-			/** @var Result $res */
-			foreach ($results as $res) {
-				$score = $res->get_score();
-			}
-
-			return array($score, $this->get_max());
-		} else {
-
-			$count = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
+            if (empty($results)) {
+                $results = Result::load(null, $stud_id, $this->id);
+                Session::write('calc_score', array($key => $results));
+            }
+
+            $score = 0;
+            /** @var Result $res */
+            foreach ($results as $res) {
+                $score = $res->get_score();
+            }
+
+            return array($score, $this->get_max());
+        } else {
+
+            $count = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
                 $allResults  = null;
             }
-			if (empty($allResults)) {
-				$allResults = Result::load(null, null, $this->id);
-				Session::write($key, $allResults);
-			}
-
-			$students = array();
-			/** @var Result $res */
-			foreach ($allResults as $res) {
-				$score = $res->get_score();
-				if (!empty($score) || $score == '0') {
-					$count++;
-					$sum += $score / $this->get_max();
-					$sumResult += $score;
-					if ($score > $bestResult) {
-						$bestResult = $score;
-					}
-					$weight = $this->get_max();
-				}
-				$students[$res->get_user_id()] = $score;
-			}
-
-			if (empty($count)) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $weight);
-					break;
-				case 'average':
-					return array($sumResult/$count, $weight);
-					break;
-				case 'ranking':
+            if (empty($allResults)) {
+                $allResults = Result::load(null, null, $this->id);
+                Session::write($key, $allResults);
+            }
+
+            $students = array();
+            /** @var Result $res */
+            foreach ($allResults as $res) {
+                $score = $res->get_score();
+                if (!empty($score) || $score == '0') {
+                    $count++;
+                    $sum += $score / $this->get_max();
+                    $sumResult += $score;
+                    if ($score > $bestResult) {
+                        $bestResult = $score;
+                    }
+                    $weight = $this->get_max();
+                }
+                $students[$res->get_user_id()] = $score;
+            }
+
+            if (empty($count)) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $weight);
+                    break;
+                case 'average':
+                    return array($sumResult/$count, $weight);
+                    break;
+                case 'ranking':
                     $students = array();
                     /** @var Result $res */
                     foreach ($allResults as $res) {
                         $score = $res->get_score();
                         $students[$res->get_user_id()] = $score;
                     }
-					return AbstractLink::getCurrentUserRanking($stud_id, $students);
-					break;
-				default:
-					return array($sum, $count);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-	public function get_target_categories()
-	{
-		// - course independent evaluation
-		//   -> movable to root or other course independent categories
-		// - evaluation inside a course
-		//   -> movable to root, independent categories or categories inside the course
-		$user = (api_is_platform_admin() ? null : api_get_user_id());
-		$targets = array();
-		$level = 0;
-
-		$root = array(0, get_lang('RootCat'), $level);
-		$targets[] = $root;
-
-		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
-			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-			}
-		}
-
-		$indcats = Category::load(null,$user,0,0);
-		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-
-		return $targets;
-	}
-
-	/**
-	 * Internal function used by get_target_categories()
-	 * @param integer $level
-	 */
-	private function add_target_subcategories($targets, $level, $catid)
-	{
-		$subcats = Category::load(null,null,null,$catid);
-		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-		return $targets;
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-	public function move_to_cat($cat)
-	{
-		$this->set_category_id($cat->get_id());
-		if ($this->get_course_code() != $cat->get_course_code()) {
-			$this->set_course_code($cat->get_course_code());
-		}
-		$this->save();
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param int $stud_id student id
-	 */
-	public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
+                    return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                    break;
+                default:
+                    return array($sum, $count);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Generate an array of possible categories where this evaluation can be moved to.
+     * Notice: its own parent will be included in the list: it's up to the frontend
+     * to disable this element.
+     * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
+     */
+    public function get_target_categories()
+    {
+        // - course independent evaluation
+        //   -> movable to root or other course independent categories
+        // - evaluation inside a course
+        //   -> movable to root, independent categories or categories inside the course
+        $user = (api_is_platform_admin() ? null : api_get_user_id());
+        $targets = array();
+        $level = 0;
+
+        $root = array(0, get_lang('RootCat'), $level);
+        $targets[] = $root;
+
+        if (isset($this->course_code) && !empty($this->course_code)) {
+            $crscats = Category::load(null,null,$this->course_code,0);
+            foreach ($crscats as $cat) {
+                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            }
+        }
+
+        $indcats = Category::load(null,$user,0,0);
+        foreach ($indcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Internal function used by get_target_categories()
+     * @param integer $level
+     */
+    private function add_target_subcategories($targets, $level, $catid)
+    {
+        $subcats = Category::load(null,null,null,$catid);
+        foreach ($subcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+        return $targets;
+    }
+
+    /**
+     * Move this evaluation to the given category.
+     * If this evaluation moves from inside a course to outside,
+     * its course code is also changed.
+     */
+    public function move_to_cat($cat)
+    {
+        $this->set_category_id($cat->get_id());
+        if ($this->get_course_code() != $cat->get_course_code()) {
+            $this->set_course_code($cat->get_course_code());
+        }
+        $this->save();
+    }
+
+    /**
+     * Retrieve evaluations where a student has results for
+     * and return them as an array of Evaluation objects
+     * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
+     * @param int $stud_id student id
+     */
+    public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
 				WHERE id IN (
 					SELECT evaluation_id FROM '.$tbl_grade_results.'
 					WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
 				)';
-		if (!api_is_allowed_to_edit()) {
-			$sql .= ' AND visible = 1';
-		}
-		if (isset($cat_id)) {
-			$sql .= ' AND category_id = '.intval($cat_id);
-		} else {
-			$sql .= ' AND category_id >= 0';
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-	/**
-	 * Get a list of students that do not have a result record for this evaluation
-	 */
-	public function get_not_subscribed_students($first_letter_user = '')
-	{
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
-			." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
-			.' AND status = '.STUDENT
-			.' AND user_id NOT IN'
-			.' (SELECT user_id FROM '.$tbl_grade_results
-			.' WHERE evaluation_id = '.intval($this->id)
-			.' )'
-			.' ORDER BY lastname';
-
-		$result = Database::query($sql);
-		$users = Database::store_result($result);
-
-		return $users;
-	}
-
-	/**
-	 * Find evaluations by name
-	 * @param string $name_mask search string
-	 * @return array evaluation objects matching the search criterium
-	 * @todo can be written more efficiently using a new (but very complex) sql query
-	 */
-	public function find_evaluations($name_mask,$selectcat)
-	{
-		$rootcat = Category::load($selectcat);
-		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
-		$foundevals = array();
-		foreach ($evals as $eval) {
-			if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
-				$foundevals[] = $eval;
-			}
-		}
-		return $foundevals;
-	}
-
-	public function get_item_type()
-	{
-		return 'E';
-	}
-
-	public function get_icon_name()
-	{
-		return $this->has_results() ? 'evalnotempty' : 'evalempty';
-	}
-
-	/**
-	 * Locks an evaluation, only one who can unlock it is the platform administrator.
-	 * @param int locked 1 or unlocked 0
-	 *
-	 **/
-	function lock($locked)
-	{
-		$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
-		Database::query($sql);
-	}
-
-	function check_lock_permissions()
-	{
-		if (api_is_platform_admin()) {
-			return true;
-		} else {
-			if ($this->is_locked()) {
-				api_not_allowed();
-			}
-		}
-	}
-
-	function delete_linked_data()
-	{
-
-	}
+        if (!api_is_allowed_to_edit()) {
+            $sql .= ' AND visible = 1';
+        }
+        if (isset($cat_id)) {
+            $sql .= ' AND category_id = '.intval($cat_id);
+        } else {
+            $sql .= ' AND category_id >= 0';
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+    /**
+     * Get a list of students that do not have a result record for this evaluation
+     */
+    public function get_not_subscribed_students($first_letter_user = '')
+    {
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
+            ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
+            .' AND status = '.STUDENT
+            .' AND user_id NOT IN'
+            .' (SELECT user_id FROM '.$tbl_grade_results
+            .' WHERE evaluation_id = '.intval($this->id)
+            .' )'
+            .' ORDER BY lastname';
+
+        $result = Database::query($sql);
+        $users = Database::store_result($result);
+
+        return $users;
+    }
+
+    /**
+     * Find evaluations by name
+     * @param string $name_mask search string
+     * @return array evaluation objects matching the search criterium
+     * @todo can be written more efficiently using a new (but very complex) sql query
+     */
+    public function find_evaluations($name_mask,$selectcat)
+    {
+        $rootcat = Category::load($selectcat);
+        $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
+        $foundevals = array();
+        foreach ($evals as $eval) {
+            if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
+                $foundevals[] = $eval;
+            }
+        }
+        return $foundevals;
+    }
+
+    public function get_item_type()
+    {
+        return 'E';
+    }
+
+    public function get_icon_name()
+    {
+        return $this->has_results() ? 'evalnotempty' : 'evalempty';
+    }
+
+    /**
+     * Locks an evaluation, only one who can unlock it is the platform administrator.
+     * @param int locked 1 or unlocked 0
+     *
+     **/
+    function lock($locked)
+    {
+        $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
+        Database::query($sql);
+    }
+
+    function check_lock_permissions()
+    {
+        if (api_is_platform_admin()) {
+            return true;
+        } else {
+            if ($this->is_locked()) {
+                api_not_allowed();
+            }
+        }
+    }
+
+    function delete_linked_data()
+    {
+
+    }
 
     public function getStudentList()
     {
         return $this->studentList;
     }
 
-	public function setStudentList($list)
-	{
-		$this->studentList = $list;
-	}
+    public function setStudentList($list)
+    {
+        $this->studentList = $list;
+    }
 }

main/gradebook/lib/results_data_generator.class.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Get total number of results (rows)
      */
-    public function get_total_results_count ()
+    public function get_total_results_count()
     {
         return count($this->results);
     }
@@ -53,12 +53,12 @@ 
      * 4 ['score']     : student's score
      * 5 ['display']   : custom score display (only if custom scoring enabled)
      */
-    public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false)
+    public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false)
     {
         // do some checks on count, redefine if invalid value
         $number_decimals = api_get_setting('gradebook_number_decimals');
         if (!isset($count)) {
-            $count = count ($this->results) - $start;
+            $count = count($this->results) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -66,11 +66,11 @@ 
         $scoredisplay = ScoreDisplay :: instance();
         // generate actual data array
         $table = array();
-        foreach($this->results as $result) {
+        foreach ($this->results as $result) {
             $user = array();
             $info = api_get_user_info($result->get_user_id());
             $user['id'] = $result->get_user_id();
-            if ($pdf){
+            if ($pdf) {
                 $user['username'] = $info['username'];
             }
             $user['result_id'] = $result->get_id();
@@ -92,7 +92,7 @@ 
                 true
             )
             );
-            if ($pdf && $number_decimals == null){
+            if ($pdf && $number_decimals == null) {
                 $user['scoreletter'] = $result->get_score();
             }
             if ($scoredisplay->is_custom()) {
@@ -132,13 +132,13 @@ 
      * @param bool  Whether we want to ignore the score color
      * @result string The score as we want to show it
      */
-    private function get_score_display ($score, $realscore, $ignore_score_color = false)
+    private function get_score_display($score, $realscore, $ignore_score_color = false)
     {
         if ($score != null) {
             $scoredisplay = ScoreDisplay :: instance();
             $type = SCORE_CUSTOM;
             if ($realscore === true) {
-                $type = SCORE_DIV_PERCENT ;
+                $type = SCORE_DIV_PERCENT;
             }
 
             return $scoredisplay->display_score(
@@ -172,10 +172,10 @@ 
         }
     }
 
-    function sort_by_mask ($item1, $item2)
+    function sort_by_mask($item1, $item2)
     {
-        $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null);
-        $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null);
+        $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null);
+        $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null);
         return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
     }
 }