@@ -90,23 +90,23 @@ discard block |
||
90 | 90 | if (is_null($id) && is_null($user_id) && !is_null($evaluation_id)) { |
91 | 91 | // Verified_if_exist_evaluation |
92 | 92 | $sql = 'SELECT COUNT(*) AS count |
93 | - FROM ' . $tbl_grade_results . ' |
|
94 | - WHERE evaluation_id="' . Database::escape_string($evaluation_id) . '";'; |
|
93 | + FROM ' . $tbl_grade_results.' |
|
94 | + WHERE evaluation_id="' . Database::escape_string($evaluation_id).'";'; |
|
95 | 95 | $result = Database::query($sql); |
96 | 96 | $existEvaluation = Database::result($result, 0, 0); |
97 | 97 | |
98 | 98 | if ($existEvaluation != 0) { |
99 | 99 | if ($sessionId) { |
100 | 100 | $sql = 'SELECT c_id, user_id as user_id, status |
101 | - FROM ' . $tbl_session_rel_course_user . ' |
|
101 | + FROM ' . $tbl_session_rel_course_user.' |
|
102 | 102 | WHERE |
103 | 103 | status= 0 AND |
104 | - c_id = "' . api_get_course_int_id() . '" AND |
|
104 | + c_id = "' . api_get_course_int_id().'" AND |
|
105 | 105 | session_id = ' . $sessionId; |
106 | 106 | } else { |
107 | 107 | $sql = 'SELECT c_id, user_id, status |
108 | - FROM ' . $tbl_course_rel_course . ' |
|
109 | - WHERE status ="' . STUDENT . '" AND c_id = "' . api_get_course_int_id() . '" '; |
|
108 | + FROM ' . $tbl_course_rel_course.' |
|
109 | + WHERE status ="' . STUDENT.'" AND c_id = "'.api_get_course_int_id().'" '; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | $res_course_rel_user = Database::query($sql); |
@@ -116,15 +116,15 @@ discard block |
||
116 | 116 | $current_date = api_get_utc_datetime(); |
117 | 117 | for ($i = 0; $i < count($list_user_course_list); $i++) { |
118 | 118 | $sql_verified = 'SELECT COUNT(*) AS count |
119 | - FROM ' . $tbl_grade_results . ' |
|
119 | + FROM ' . $tbl_grade_results.' |
|
120 | 120 | WHERE |
121 | - user_id="' . intval($list_user_course_list[$i]['user_id']) . '" AND |
|
122 | - evaluation_id="' . intval($evaluation_id) . '";'; |
|
121 | + user_id="' . intval($list_user_course_list[$i]['user_id']).'" AND |
|
122 | + evaluation_id="' . intval($evaluation_id).'";'; |
|
123 | 123 | $res_verified = Database::query($sql_verified); |
124 | 124 | $info_verified = Database::result($res_verified, 0, 0); |
125 | 125 | if ($info_verified == 0) { |
126 | - $sql_insert = 'INSERT INTO ' . $tbl_grade_results . '(user_id,evaluation_id,created_at,score) |
|
127 | - VALUES ("' . intval($list_user_course_list[$i]['user_id']) . '","' . intval($evaluation_id) . '","' . $current_date . '",0);'; |
|
126 | + $sql_insert = 'INSERT INTO '.$tbl_grade_results.'(user_id,evaluation_id,created_at,score) |
|
127 | + VALUES ("' . intval($list_user_course_list[$i]['user_id']).'","'.intval($evaluation_id).'","'.$current_date.'",0);'; |
|
128 | 128 | Database::query($sql_insert); |
129 | 129 | } |
130 | 130 | } |
@@ -148,16 +148,16 @@ discard block |
||
148 | 148 | |
149 | 149 | $paramcount = 0; |
150 | 150 | if (!empty($id)) { |
151 | - $sql.= ' WHERE gr.id = ' . intval($id); |
|
152 | - $paramcount ++; |
|
151 | + $sql .= ' WHERE gr.id = '.intval($id); |
|
152 | + $paramcount++; |
|
153 | 153 | } |
154 | 154 | if (!empty($user_id)) { |
155 | 155 | if ($paramcount != 0) |
156 | 156 | $sql .= ' AND'; |
157 | 157 | else |
158 | 158 | $sql .= ' WHERE'; |
159 | - $sql .= ' gr.user_id = ' . intval($user_id); |
|
160 | - $paramcount ++; |
|
159 | + $sql .= ' gr.user_id = '.intval($user_id); |
|
160 | + $paramcount++; |
|
161 | 161 | } |
162 | 162 | if (!empty($evaluation_id)) { |
163 | 163 | if ($paramcount != 0) { |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | } else { |
166 | 166 | $sql .= ' WHERE'; |
167 | 167 | } |
168 | - $sql .= ' gr.evaluation_id = ' . intval($evaluation_id); |
|
169 | - $paramcount ++; |
|
168 | + $sql .= ' gr.evaluation_id = '.intval($evaluation_id); |
|
169 | + $paramcount++; |
|
170 | 170 | } |
171 | 171 | $sql .= ' ORDER BY u.lastname, u.firstname'; |
172 | 172 | $result = Database::query($sql); |
@@ -191,17 +191,17 @@ discard block |
||
191 | 191 | { |
192 | 192 | if (isset($this->user_id) && isset($this->evaluation)) { |
193 | 193 | $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
194 | - $sql = "INSERT INTO " . $tbl_grade_results |
|
194 | + $sql = "INSERT INTO ".$tbl_grade_results |
|
195 | 195 | . " (user_id, evaluation_id, |
196 | 196 | created_at"; |
197 | 197 | if (isset($this->score)) { |
198 | 198 | $sql .= ",score"; |
199 | 199 | } |
200 | 200 | $sql .= ") VALUES |
201 | - (" . (int) $this->get_user_id() . ", " . (int) $this->get_evaluation_id() |
|
202 | - . ", '" . $this->get_date() . "' "; |
|
201 | + (" . (int) $this->get_user_id().", ".(int) $this->get_evaluation_id() |
|
202 | + . ", '".$this->get_date()."' "; |
|
203 | 203 | if (isset($this->score)) { |
204 | - $sql .= ", " . $this->get_score(); |
|
204 | + $sql .= ", ".$this->get_score(); |
|
205 | 205 | } |
206 | 206 | $sql .= ")"; |
207 | 207 | Database::query($sql); |
@@ -222,16 +222,16 @@ discard block |
||
222 | 222 | $arr_result = $result->load(null, $userid, $evaluationid); |
223 | 223 | $arr = get_object_vars($arr_result[0]); |
224 | 224 | |
225 | - $sql = 'INSERT INTO ' . $tbl_grade_results_log |
|
225 | + $sql = 'INSERT INTO '.$tbl_grade_results_log |
|
226 | 226 | . ' (id_result,user_id, evaluation_id,created_at'; |
227 | 227 | if (isset($arr['score'])) { |
228 | 228 | $sql .= ',score'; |
229 | 229 | } |
230 | 230 | $sql .= ') VALUES |
231 | - (' . (int) $arr['id'] . ',' . (int) $arr['user_id'] . ', ' . (int) $arr['evaluation'] |
|
232 | - . ", '" . api_get_utc_datetime() . "'"; |
|
231 | + (' . (int) $arr['id'].','.(int) $arr['user_id'].', '.(int) $arr['evaluation'] |
|
232 | + . ", '".api_get_utc_datetime()."'"; |
|
233 | 233 | if (isset($arr['score'])) { |
234 | - $sql .= ', ' . $arr['score']; |
|
234 | + $sql .= ', '.$arr['score']; |
|
235 | 235 | } |
236 | 236 | $sql .= ')'; |
237 | 237 | |
@@ -247,16 +247,16 @@ discard block |
||
247 | 247 | public function save() |
248 | 248 | { |
249 | 249 | $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
250 | - $sql = 'UPDATE ' . $tbl_grade_results . ' |
|
250 | + $sql = 'UPDATE '.$tbl_grade_results.' |
|
251 | 251 | SET user_id = ' . $this->get_user_id() |
252 | - . ', evaluation_id = ' . $this->get_evaluation_id() |
|
252 | + . ', evaluation_id = '.$this->get_evaluation_id() |
|
253 | 253 | . ', score = '; |
254 | 254 | if (isset($this->score)) { |
255 | 255 | $sql .= $this->get_score(); |
256 | 256 | } else { |
257 | 257 | $sql .= 'null'; |
258 | 258 | } |
259 | - $sql .= ' WHERE id = ' . $this->id; |
|
259 | + $sql .= ' WHERE id = '.$this->id; |
|
260 | 260 | // no need to update creation date |
261 | 261 | Database::query($sql); |
262 | 262 | } |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | public function delete() |
268 | 268 | { |
269 | 269 | $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
270 | - $sql = 'DELETE FROM ' . $tbl_grade_results . ' WHERE id = ' . $this->id; |
|
270 | + $sql = 'DELETE FROM '.$tbl_grade_results.' WHERE id = '.$this->id; |
|
271 | 271 | Database::query($sql); |
272 | 272 | } |
273 | 273 | } |
@@ -152,10 +152,11 @@ |
||
152 | 152 | $paramcount ++; |
153 | 153 | } |
154 | 154 | if (!empty($user_id)) { |
155 | - if ($paramcount != 0) |
|
156 | - $sql .= ' AND'; |
|
157 | - else |
|
158 | - $sql .= ' WHERE'; |
|
155 | + if ($paramcount != 0) { |
|
156 | + $sql .= ' AND'; |
|
157 | + } else { |
|
158 | + $sql .= ' WHERE'; |
|
159 | + } |
|
159 | 160 | $sql .= ' gr.user_id = ' . intval($user_id); |
160 | 161 | $paramcount ++; |
161 | 162 | } |
@@ -223,36 +223,36 @@ discard block |
||
223 | 223 | $paramcount = 0; |
224 | 224 | |
225 | 225 | if (isset ($id)) { |
226 | - $sql.= ' WHERE id = '.intval($id); |
|
227 | - $paramcount ++; |
|
226 | + $sql .= ' WHERE id = '.intval($id); |
|
227 | + $paramcount++; |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | if (isset ($user_id)) { |
231 | 231 | if ($paramcount != 0) $sql .= ' AND'; |
232 | 232 | else $sql .= ' WHERE'; |
233 | 233 | $sql .= ' user_id = '.intval($user_id); |
234 | - $paramcount ++; |
|
234 | + $paramcount++; |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | if (isset ($course_code) && $course_code <> '-1') { |
238 | 238 | if ($paramcount != 0) $sql .= ' AND'; |
239 | 239 | else $sql .= ' WHERE'; |
240 | 240 | $sql .= " course_code = '".Database::escape_string($course_code)."'"; |
241 | - $paramcount ++; |
|
241 | + $paramcount++; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | if (isset ($category_id)) { |
245 | 245 | if ($paramcount != 0) $sql .= ' AND'; |
246 | 246 | else $sql .= ' WHERE'; |
247 | 247 | $sql .= ' category_id = '.intval($category_id); |
248 | - $paramcount ++; |
|
248 | + $paramcount++; |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | if (isset ($visible)) { |
252 | 252 | if ($paramcount != 0) $sql .= ' AND'; |
253 | 253 | else $sql .= ' WHERE'; |
254 | 254 | $sql .= ' visible = '.intval($visible); |
255 | - $paramcount ++; |
|
255 | + $paramcount++; |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | if (isset ($locked)) { |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | $alleval = array(); |
279 | 279 | if (Database::num_rows($result)) { |
280 | 280 | while ($data = Database::fetch_array($result)) { |
281 | - $eval= new Evaluation(); |
|
281 | + $eval = new Evaluation(); |
|
282 | 282 | $eval->set_id($data['id']); |
283 | 283 | $eval->set_name($data['name']); |
284 | 284 | $eval->set_description($data['description']); |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
364 | 364 | $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); |
365 | 365 | $eval = new Evaluation(); |
366 | - $dateobject = $eval->load($idevaluation,null,null,null,null); |
|
366 | + $dateobject = $eval->load($idevaluation, null, null, null, null); |
|
367 | 367 | $arreval = get_object_vars($dateobject[0]); |
368 | 368 | if (!empty($arreval['id'])) { |
369 | 369 | $sql = 'SELECT weight from '.$tbl_grade_evaluations.' |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | .', description = '; |
398 | 398 | if (isset($this->description)) { |
399 | 399 | $sql .= "'".Database::escape_string($this->get_description())."'"; |
400 | - }else { |
|
400 | + } else { |
|
401 | 401 | $sql .= 'null'; |
402 | 402 | } |
403 | 403 | $sql .= ', user_id = '.intval($this->get_user_id()) |
@@ -468,17 +468,17 @@ discard block |
||
468 | 468 | $sql .= ' AND user_id = '.api_get_user_id(); |
469 | 469 | } |
470 | 470 | |
471 | - }else { |
|
471 | + } else { |
|
472 | 472 | $sql .= ' AND user_id = '.api_get_user_id(); |
473 | 473 | } |
474 | 474 | |
475 | 475 | if (!isset ($parent)) { |
476 | - $sql.= ' AND category_id is null'; |
|
476 | + $sql .= ' AND category_id is null'; |
|
477 | 477 | } else { |
478 | - $sql.= ' AND category_id = '.intval($parent); |
|
478 | + $sql .= ' AND category_id = '.intval($parent); |
|
479 | 479 | } |
480 | 480 | $result = Database::query($sql); |
481 | - $number=Database::fetch_row($result); |
|
481 | + $number = Database::fetch_row($result); |
|
482 | 482 | |
483 | 483 | return $number[0] != 0; |
484 | 484 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | FROM '.$tbl_grade_results.' |
495 | 495 | WHERE evaluation_id = '.intval($this->id); |
496 | 496 | $result = Database::query($sql); |
497 | - $number=Database::fetch_row($result); |
|
497 | + $number = Database::fetch_row($result); |
|
498 | 498 | |
499 | 499 | return ($number[0] != 0); |
500 | 500 | } |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | $results = isset($data[$key]) ? $data[$key] : null; |
545 | 545 | |
546 | 546 | if ($useSession == false) { |
547 | - $results = null; |
|
547 | + $results = null; |
|
548 | 548 | } |
549 | 549 | if (empty($results)) { |
550 | 550 | $results = Result::load(null, $stud_id, $this->id); |
@@ -570,7 +570,7 @@ discard block |
||
570 | 570 | $data = Session::read('calc_score'); |
571 | 571 | $allResults = isset($data[$key]) ? $data[$key] : null; |
572 | 572 | if ($useSession == false) { |
573 | - $allResults = null; |
|
573 | + $allResults = null; |
|
574 | 574 | } |
575 | 575 | if (empty($allResults)) { |
576 | 576 | $allResults = Result::load(null, null, $this->id); |
@@ -602,7 +602,7 @@ discard block |
||
602 | 602 | return array($bestResult, $weight); |
603 | 603 | break; |
604 | 604 | case 'average': |
605 | - return array($sumResult/$count, $weight); |
|
605 | + return array($sumResult / $count, $weight); |
|
606 | 606 | break; |
607 | 607 | case 'ranking': |
608 | 608 | $students = array(); |
@@ -640,17 +640,17 @@ discard block |
||
640 | 640 | $targets[] = $root; |
641 | 641 | |
642 | 642 | if (isset($this->course_code) && !empty($this->course_code)) { |
643 | - $crscats = Category::load(null,null,$this->course_code,0); |
|
643 | + $crscats = Category::load(null, null, $this->course_code, 0); |
|
644 | 644 | foreach ($crscats as $cat) { |
645 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
646 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
645 | + $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1); |
|
646 | + $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id()); |
|
647 | 647 | } |
648 | 648 | } |
649 | 649 | |
650 | - $indcats = Category::load(null,$user,0,0); |
|
650 | + $indcats = Category::load(null, $user, 0, 0); |
|
651 | 651 | foreach ($indcats as $cat) { |
652 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
653 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
652 | + $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1); |
|
653 | + $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id()); |
|
654 | 654 | } |
655 | 655 | |
656 | 656 | return $targets; |
@@ -661,10 +661,10 @@ discard block |
||
661 | 661 | */ |
662 | 662 | private function add_target_subcategories($targets, $level, $catid) |
663 | 663 | { |
664 | - $subcats = Category::load(null,null,null,$catid); |
|
664 | + $subcats = Category::load(null, null, null, $catid); |
|
665 | 665 | foreach ($subcats as $cat) { |
666 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
667 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
666 | + $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1); |
|
667 | + $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id()); |
|
668 | 668 | } |
669 | 669 | return $targets; |
670 | 670 | } |
@@ -743,7 +743,7 @@ discard block |
||
743 | 743 | * @return array evaluation objects matching the search criterium |
744 | 744 | * @todo can be written more efficiently using a new (but very complex) sql query |
745 | 745 | */ |
746 | - public function find_evaluations($name_mask,$selectcat) |
|
746 | + public function find_evaluations($name_mask, $selectcat) |
|
747 | 747 | { |
748 | 748 | $rootcat = Category::load($selectcat); |
749 | 749 | $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true); |
@@ -228,36 +228,51 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | if (isset ($user_id)) { |
231 | - if ($paramcount != 0) $sql .= ' AND'; |
|
232 | - else $sql .= ' WHERE'; |
|
231 | + if ($paramcount != 0) { |
|
232 | + $sql .= ' AND'; |
|
233 | + } else { |
|
234 | + $sql .= ' WHERE'; |
|
235 | + } |
|
233 | 236 | $sql .= ' user_id = '.intval($user_id); |
234 | 237 | $paramcount ++; |
235 | 238 | } |
236 | 239 | |
237 | 240 | if (isset ($course_code) && $course_code <> '-1') { |
238 | - if ($paramcount != 0) $sql .= ' AND'; |
|
239 | - else $sql .= ' WHERE'; |
|
241 | + if ($paramcount != 0) { |
|
242 | + $sql .= ' AND'; |
|
243 | + } else { |
|
244 | + $sql .= ' WHERE'; |
|
245 | + } |
|
240 | 246 | $sql .= " course_code = '".Database::escape_string($course_code)."'"; |
241 | 247 | $paramcount ++; |
242 | 248 | } |
243 | 249 | |
244 | 250 | if (isset ($category_id)) { |
245 | - if ($paramcount != 0) $sql .= ' AND'; |
|
246 | - else $sql .= ' WHERE'; |
|
251 | + if ($paramcount != 0) { |
|
252 | + $sql .= ' AND'; |
|
253 | + } else { |
|
254 | + $sql .= ' WHERE'; |
|
255 | + } |
|
247 | 256 | $sql .= ' category_id = '.intval($category_id); |
248 | 257 | $paramcount ++; |
249 | 258 | } |
250 | 259 | |
251 | 260 | if (isset ($visible)) { |
252 | - if ($paramcount != 0) $sql .= ' AND'; |
|
253 | - else $sql .= ' WHERE'; |
|
261 | + if ($paramcount != 0) { |
|
262 | + $sql .= ' AND'; |
|
263 | + } else { |
|
264 | + $sql .= ' WHERE'; |
|
265 | + } |
|
254 | 266 | $sql .= ' visible = '.intval($visible); |
255 | 267 | $paramcount ++; |
256 | 268 | } |
257 | 269 | |
258 | 270 | if (isset ($locked)) { |
259 | - if ($paramcount != 0) $sql .= ' AND'; |
|
260 | - else $sql .= ' WHERE'; |
|
271 | + if ($paramcount != 0) { |
|
272 | + $sql .= ' AND'; |
|
273 | + } else { |
|
274 | + $sql .= ' WHERE'; |
|
275 | + } |
|
261 | 276 | $sql .= ' locked = '.intval($locked); |
262 | 277 | } |
263 | 278 | |
@@ -397,7 +412,7 @@ discard block |
||
397 | 412 | .', description = '; |
398 | 413 | if (isset($this->description)) { |
399 | 414 | $sql .= "'".Database::escape_string($this->get_description())."'"; |
400 | - }else { |
|
415 | + } else { |
|
401 | 416 | $sql .= 'null'; |
402 | 417 | } |
403 | 418 | $sql .= ', user_id = '.intval($this->get_user_id()) |
@@ -468,7 +483,7 @@ discard block |
||
468 | 483 | $sql .= ' AND user_id = '.api_get_user_id(); |
469 | 484 | } |
470 | 485 | |
471 | - }else { |
|
486 | + } else { |
|
472 | 487 | $sql .= ' AND user_id = '.api_get_user_id(); |
473 | 488 | } |
474 | 489 |
@@ -273,7 +273,7 @@ |
||
273 | 273 | |
274 | 274 | |
275 | 275 | /** |
276 | - * @param array $result |
|
276 | + * @param Doctrine\DBAL\Driver\Statement|null $result |
|
277 | 277 | * @return array |
278 | 278 | */ |
279 | 279 | private static function create_evaluation_objects_from_sql_result($result) |
@@ -9,367 +9,367 @@ discard block |
||
9 | 9 | */ |
10 | 10 | class Evaluation implements GradebookItem |
11 | 11 | { |
12 | - private $id; |
|
13 | - private $name; |
|
14 | - private $description; |
|
15 | - private $user_id; |
|
16 | - private $course_code; |
|
17 | - /** @var Category */ |
|
18 | - private $category; |
|
19 | - private $created_at; |
|
20 | - private $weight; |
|
21 | - private $eval_max; |
|
22 | - private $visible; |
|
23 | - private $sessionId; |
|
24 | - public $studentList; |
|
25 | - |
|
26 | - /** |
|
27 | - * Construct |
|
28 | - */ |
|
29 | - public function __construct() |
|
30 | - { |
|
31 | - } |
|
32 | - |
|
33 | - /** |
|
34 | - * @return Category |
|
35 | - */ |
|
36 | - public function getCategory() |
|
37 | - { |
|
38 | - return $this->category; |
|
39 | - } |
|
40 | - |
|
41 | - /** |
|
42 | - * @param Category $category |
|
43 | - */ |
|
44 | - public function setCategory($category) |
|
45 | - { |
|
46 | - $this->category = $category; |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * @return int |
|
51 | - */ |
|
52 | - public function get_category_id() |
|
53 | - { |
|
54 | - return $this->category->get_id(); |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * @param int $category_id |
|
59 | - */ |
|
60 | - public function set_category_id($category_id) |
|
61 | - { |
|
62 | - $categories = Category::load($category_id); |
|
63 | - if (isset($categories[0])) { |
|
64 | - $this->setCategory($categories[0]); |
|
65 | - } |
|
66 | - } |
|
67 | - |
|
68 | - /** |
|
69 | - * @return int |
|
70 | - */ |
|
71 | - public function get_id() |
|
72 | - { |
|
73 | - return $this->id; |
|
74 | - } |
|
75 | - |
|
76 | - /** |
|
77 | - * @return string |
|
78 | - */ |
|
79 | - public function get_name() |
|
80 | - { |
|
81 | - return $this->name; |
|
82 | - } |
|
83 | - |
|
84 | - /** |
|
85 | - * @return string |
|
86 | - */ |
|
87 | - public function get_description() |
|
88 | - { |
|
89 | - return $this->description; |
|
90 | - } |
|
91 | - |
|
92 | - public function get_user_id() |
|
93 | - { |
|
94 | - return $this->user_id; |
|
95 | - } |
|
96 | - |
|
97 | - public function get_course_code() |
|
98 | - { |
|
99 | - return $this->course_code; |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @return int |
|
104 | - */ |
|
105 | - public function getSessionId() |
|
106 | - { |
|
107 | - return $this->sessionId; |
|
108 | - } |
|
109 | - |
|
110 | - /** |
|
111 | - * @param int $sessionId |
|
112 | - */ |
|
113 | - public function setSessionId($sessionId) |
|
114 | - { |
|
115 | - $this->sessionId = intval($sessionId); |
|
116 | - } |
|
117 | - |
|
118 | - public function get_date() |
|
119 | - { |
|
120 | - return $this->created_at; |
|
121 | - } |
|
122 | - |
|
123 | - public function get_weight() |
|
124 | - { |
|
125 | - return $this->weight; |
|
126 | - } |
|
127 | - |
|
128 | - public function get_max() |
|
129 | - { |
|
130 | - return $this->eval_max; |
|
131 | - } |
|
132 | - |
|
133 | - public function get_type() |
|
134 | - { |
|
135 | - return $this->type; |
|
136 | - } |
|
137 | - |
|
138 | - public function is_visible() |
|
139 | - { |
|
140 | - return $this->visible; |
|
141 | - } |
|
142 | - |
|
143 | - public function get_locked() |
|
144 | - { |
|
145 | - return $this->locked; |
|
146 | - } |
|
147 | - |
|
148 | - public function is_locked() |
|
149 | - { |
|
150 | - return isset($this->locked) && $this->locked == 1 ? true : false; |
|
151 | - } |
|
152 | - |
|
153 | - public function set_id($id) |
|
154 | - { |
|
155 | - $this->id = $id; |
|
156 | - } |
|
157 | - |
|
158 | - public function set_name($name) |
|
159 | - { |
|
160 | - $this->name = $name; |
|
161 | - } |
|
162 | - |
|
163 | - public function set_description($description) |
|
164 | - { |
|
165 | - $this->description = $description; |
|
166 | - } |
|
167 | - |
|
168 | - public function set_user_id($user_id) |
|
169 | - { |
|
170 | - $this->user_id = $user_id; |
|
171 | - } |
|
172 | - |
|
173 | - public function set_course_code($course_code) |
|
174 | - { |
|
175 | - $this->course_code = $course_code; |
|
176 | - } |
|
177 | - |
|
178 | - public function set_date($date) |
|
179 | - { |
|
180 | - $this->created_at = $date; |
|
181 | - } |
|
182 | - |
|
183 | - public function set_weight($weight) |
|
184 | - { |
|
185 | - $this->weight = $weight; |
|
186 | - } |
|
187 | - |
|
188 | - public function set_max($max) |
|
189 | - { |
|
190 | - $this->eval_max = $max; |
|
191 | - } |
|
192 | - |
|
193 | - public function set_visible($visible) |
|
194 | - { |
|
195 | - $this->visible = $visible; |
|
196 | - } |
|
197 | - |
|
198 | - public function set_type($type) |
|
199 | - { |
|
200 | - $this->type = $type; |
|
201 | - } |
|
202 | - |
|
203 | - public function set_locked($locked) |
|
204 | - { |
|
205 | - $this->locked = $locked; |
|
206 | - } |
|
207 | - |
|
208 | - /** |
|
209 | - * Retrieve evaluations and return them as an array of Evaluation objects |
|
210 | - * @param int $id evaluation id |
|
211 | - * @param int $user_id user id (evaluation owner) |
|
212 | - * @param string $course_code course code |
|
213 | - * @param int $category_id parent category |
|
214 | - * @param integer $visible visible |
|
215 | - */ |
|
216 | - public static function load( |
|
217 | - $id = null, |
|
218 | - $user_id = null, |
|
219 | - $course_code = null, |
|
220 | - $category_id = null, |
|
221 | - $visible = null, |
|
222 | - $locked = null |
|
223 | - ) { |
|
224 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
225 | - $sql = 'SELECT * FROM '.$tbl_grade_evaluations; |
|
226 | - $paramcount = 0; |
|
227 | - |
|
228 | - if (isset ($id)) { |
|
229 | - $sql.= ' WHERE id = '.intval($id); |
|
230 | - $paramcount ++; |
|
231 | - } |
|
232 | - |
|
233 | - if (isset ($user_id)) { |
|
234 | - if ($paramcount != 0) $sql .= ' AND'; |
|
235 | - else $sql .= ' WHERE'; |
|
236 | - $sql .= ' user_id = '.intval($user_id); |
|
237 | - $paramcount ++; |
|
238 | - } |
|
239 | - |
|
240 | - if (isset ($course_code) && $course_code <> '-1') { |
|
241 | - if ($paramcount != 0) $sql .= ' AND'; |
|
242 | - else $sql .= ' WHERE'; |
|
243 | - $sql .= " course_code = '".Database::escape_string($course_code)."'"; |
|
244 | - $paramcount ++; |
|
245 | - } |
|
246 | - |
|
247 | - if (isset ($category_id)) { |
|
248 | - if ($paramcount != 0) $sql .= ' AND'; |
|
249 | - else $sql .= ' WHERE'; |
|
250 | - $sql .= ' category_id = '.intval($category_id); |
|
251 | - $paramcount ++; |
|
252 | - } |
|
253 | - |
|
254 | - if (isset ($visible)) { |
|
255 | - if ($paramcount != 0) $sql .= ' AND'; |
|
256 | - else $sql .= ' WHERE'; |
|
257 | - $sql .= ' visible = '.intval($visible); |
|
258 | - $paramcount ++; |
|
259 | - } |
|
260 | - |
|
261 | - if (isset ($locked)) { |
|
262 | - if ($paramcount != 0) $sql .= ' AND'; |
|
263 | - else $sql .= ' WHERE'; |
|
264 | - $sql .= ' locked = '.intval($locked); |
|
265 | - } |
|
266 | - |
|
267 | - $result = Database::query($sql); |
|
268 | - $alleval = Evaluation::create_evaluation_objects_from_sql_result($result); |
|
269 | - |
|
270 | - return $alleval; |
|
271 | - } |
|
272 | - |
|
273 | - |
|
274 | - |
|
275 | - /** |
|
276 | - * @param array $result |
|
277 | - * @return array |
|
278 | - */ |
|
279 | - private static function create_evaluation_objects_from_sql_result($result) |
|
280 | - { |
|
281 | - $alleval = array(); |
|
282 | - if (Database::num_rows($result)) { |
|
283 | - while ($data = Database::fetch_array($result)) { |
|
284 | - $eval= new Evaluation(); |
|
285 | - $eval->set_id($data['id']); |
|
286 | - $eval->set_name($data['name']); |
|
287 | - $eval->set_description($data['description']); |
|
288 | - $eval->set_user_id($data['user_id']); |
|
289 | - $eval->set_course_code($data['course_code']); |
|
290 | - $eval->set_category_id($data['category_id']); |
|
291 | - $eval->set_date(api_get_local_time($data['created_at'])); |
|
292 | - $eval->set_weight($data['weight']); |
|
293 | - $eval->set_max($data['max']); |
|
294 | - $eval->set_visible($data['visible']); |
|
295 | - $eval->set_type($data['type']); |
|
296 | - $eval->set_locked($data['locked']); |
|
297 | - $eval->setSessionId(api_get_session_id()); |
|
298 | - |
|
299 | - $alleval[] = $eval; |
|
300 | - } |
|
301 | - } |
|
302 | - |
|
303 | - return $alleval; |
|
304 | - } |
|
305 | - |
|
306 | - /** |
|
307 | - * Insert this evaluation into the database |
|
308 | - */ |
|
309 | - public function add() |
|
310 | - { |
|
311 | - if (isset($this->name) && |
|
312 | - isset($this->user_id) && |
|
313 | - isset($this->weight) && |
|
314 | - isset ($this->eval_max) && |
|
315 | - isset($this->visible) |
|
316 | - ) { |
|
317 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
318 | - |
|
319 | - $sql = 'INSERT INTO '.$tbl_grade_evaluations |
|
320 | - .' (name, user_id, weight, max, visible'; |
|
321 | - if (isset($this->description)) { |
|
322 | - $sql .= ',description'; |
|
323 | - } |
|
324 | - if (isset($this->course_code)) { |
|
325 | - $sql .= ', course_code'; |
|
326 | - } |
|
327 | - if (isset($this->category)) { |
|
328 | - $sql .= ', category_id'; |
|
329 | - } |
|
330 | - $sql .= ', created_at'; |
|
331 | - $sql .= ',type'; |
|
332 | - $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'" |
|
333 | - .','.intval($this->get_user_id()) |
|
334 | - .','.floatval($this->get_weight()) |
|
335 | - .','.intval($this->get_max()) |
|
336 | - .','.intval($this->is_visible()); |
|
337 | - if (isset($this->description)) { |
|
338 | - $sql .= ",'".Database::escape_string($this->get_description())."'"; |
|
339 | - } |
|
340 | - if (isset($this->course_code)) { |
|
341 | - $sql .= ",'".Database::escape_string($this->get_course_code())."'"; |
|
342 | - } |
|
343 | - if (isset($this->category)) { |
|
344 | - $sql .= ','.intval($this->get_category_id()); |
|
345 | - } |
|
346 | - if (empty($this->type)) { |
|
347 | - $this->type = 'evaluation'; |
|
348 | - } |
|
349 | - $sql .= ", '".api_get_utc_datetime()."'"; |
|
350 | - $sql .= ',\''.Database::escape_string($this->type).'\''; |
|
351 | - $sql .= ")"; |
|
352 | - |
|
353 | - Database::query($sql); |
|
354 | - $this->set_id(Database::insert_id()); |
|
355 | - } else { |
|
356 | - die('Error in Evaluation add: required field empty'); |
|
357 | - } |
|
358 | - } |
|
359 | - |
|
360 | - /** |
|
361 | - * @param int $idevaluation |
|
362 | - */ |
|
363 | - public function add_evaluation_log($idevaluation) |
|
364 | - { |
|
365 | - if (!empty($idevaluation)) { |
|
366 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
367 | - $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); |
|
368 | - $eval = new Evaluation(); |
|
369 | - $dateobject = $eval->load($idevaluation,null,null,null,null); |
|
370 | - $arreval = get_object_vars($dateobject[0]); |
|
371 | - if (!empty($arreval['id'])) { |
|
372 | - $sql = 'SELECT weight from '.$tbl_grade_evaluations.' |
|
12 | + private $id; |
|
13 | + private $name; |
|
14 | + private $description; |
|
15 | + private $user_id; |
|
16 | + private $course_code; |
|
17 | + /** @var Category */ |
|
18 | + private $category; |
|
19 | + private $created_at; |
|
20 | + private $weight; |
|
21 | + private $eval_max; |
|
22 | + private $visible; |
|
23 | + private $sessionId; |
|
24 | + public $studentList; |
|
25 | + |
|
26 | + /** |
|
27 | + * Construct |
|
28 | + */ |
|
29 | + public function __construct() |
|
30 | + { |
|
31 | + } |
|
32 | + |
|
33 | + /** |
|
34 | + * @return Category |
|
35 | + */ |
|
36 | + public function getCategory() |
|
37 | + { |
|
38 | + return $this->category; |
|
39 | + } |
|
40 | + |
|
41 | + /** |
|
42 | + * @param Category $category |
|
43 | + */ |
|
44 | + public function setCategory($category) |
|
45 | + { |
|
46 | + $this->category = $category; |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * @return int |
|
51 | + */ |
|
52 | + public function get_category_id() |
|
53 | + { |
|
54 | + return $this->category->get_id(); |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * @param int $category_id |
|
59 | + */ |
|
60 | + public function set_category_id($category_id) |
|
61 | + { |
|
62 | + $categories = Category::load($category_id); |
|
63 | + if (isset($categories[0])) { |
|
64 | + $this->setCategory($categories[0]); |
|
65 | + } |
|
66 | + } |
|
67 | + |
|
68 | + /** |
|
69 | + * @return int |
|
70 | + */ |
|
71 | + public function get_id() |
|
72 | + { |
|
73 | + return $this->id; |
|
74 | + } |
|
75 | + |
|
76 | + /** |
|
77 | + * @return string |
|
78 | + */ |
|
79 | + public function get_name() |
|
80 | + { |
|
81 | + return $this->name; |
|
82 | + } |
|
83 | + |
|
84 | + /** |
|
85 | + * @return string |
|
86 | + */ |
|
87 | + public function get_description() |
|
88 | + { |
|
89 | + return $this->description; |
|
90 | + } |
|
91 | + |
|
92 | + public function get_user_id() |
|
93 | + { |
|
94 | + return $this->user_id; |
|
95 | + } |
|
96 | + |
|
97 | + public function get_course_code() |
|
98 | + { |
|
99 | + return $this->course_code; |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @return int |
|
104 | + */ |
|
105 | + public function getSessionId() |
|
106 | + { |
|
107 | + return $this->sessionId; |
|
108 | + } |
|
109 | + |
|
110 | + /** |
|
111 | + * @param int $sessionId |
|
112 | + */ |
|
113 | + public function setSessionId($sessionId) |
|
114 | + { |
|
115 | + $this->sessionId = intval($sessionId); |
|
116 | + } |
|
117 | + |
|
118 | + public function get_date() |
|
119 | + { |
|
120 | + return $this->created_at; |
|
121 | + } |
|
122 | + |
|
123 | + public function get_weight() |
|
124 | + { |
|
125 | + return $this->weight; |
|
126 | + } |
|
127 | + |
|
128 | + public function get_max() |
|
129 | + { |
|
130 | + return $this->eval_max; |
|
131 | + } |
|
132 | + |
|
133 | + public function get_type() |
|
134 | + { |
|
135 | + return $this->type; |
|
136 | + } |
|
137 | + |
|
138 | + public function is_visible() |
|
139 | + { |
|
140 | + return $this->visible; |
|
141 | + } |
|
142 | + |
|
143 | + public function get_locked() |
|
144 | + { |
|
145 | + return $this->locked; |
|
146 | + } |
|
147 | + |
|
148 | + public function is_locked() |
|
149 | + { |
|
150 | + return isset($this->locked) && $this->locked == 1 ? true : false; |
|
151 | + } |
|
152 | + |
|
153 | + public function set_id($id) |
|
154 | + { |
|
155 | + $this->id = $id; |
|
156 | + } |
|
157 | + |
|
158 | + public function set_name($name) |
|
159 | + { |
|
160 | + $this->name = $name; |
|
161 | + } |
|
162 | + |
|
163 | + public function set_description($description) |
|
164 | + { |
|
165 | + $this->description = $description; |
|
166 | + } |
|
167 | + |
|
168 | + public function set_user_id($user_id) |
|
169 | + { |
|
170 | + $this->user_id = $user_id; |
|
171 | + } |
|
172 | + |
|
173 | + public function set_course_code($course_code) |
|
174 | + { |
|
175 | + $this->course_code = $course_code; |
|
176 | + } |
|
177 | + |
|
178 | + public function set_date($date) |
|
179 | + { |
|
180 | + $this->created_at = $date; |
|
181 | + } |
|
182 | + |
|
183 | + public function set_weight($weight) |
|
184 | + { |
|
185 | + $this->weight = $weight; |
|
186 | + } |
|
187 | + |
|
188 | + public function set_max($max) |
|
189 | + { |
|
190 | + $this->eval_max = $max; |
|
191 | + } |
|
192 | + |
|
193 | + public function set_visible($visible) |
|
194 | + { |
|
195 | + $this->visible = $visible; |
|
196 | + } |
|
197 | + |
|
198 | + public function set_type($type) |
|
199 | + { |
|
200 | + $this->type = $type; |
|
201 | + } |
|
202 | + |
|
203 | + public function set_locked($locked) |
|
204 | + { |
|
205 | + $this->locked = $locked; |
|
206 | + } |
|
207 | + |
|
208 | + /** |
|
209 | + * Retrieve evaluations and return them as an array of Evaluation objects |
|
210 | + * @param int $id evaluation id |
|
211 | + * @param int $user_id user id (evaluation owner) |
|
212 | + * @param string $course_code course code |
|
213 | + * @param int $category_id parent category |
|
214 | + * @param integer $visible visible |
|
215 | + */ |
|
216 | + public static function load( |
|
217 | + $id = null, |
|
218 | + $user_id = null, |
|
219 | + $course_code = null, |
|
220 | + $category_id = null, |
|
221 | + $visible = null, |
|
222 | + $locked = null |
|
223 | + ) { |
|
224 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
225 | + $sql = 'SELECT * FROM '.$tbl_grade_evaluations; |
|
226 | + $paramcount = 0; |
|
227 | + |
|
228 | + if (isset ($id)) { |
|
229 | + $sql.= ' WHERE id = '.intval($id); |
|
230 | + $paramcount ++; |
|
231 | + } |
|
232 | + |
|
233 | + if (isset ($user_id)) { |
|
234 | + if ($paramcount != 0) $sql .= ' AND'; |
|
235 | + else $sql .= ' WHERE'; |
|
236 | + $sql .= ' user_id = '.intval($user_id); |
|
237 | + $paramcount ++; |
|
238 | + } |
|
239 | + |
|
240 | + if (isset ($course_code) && $course_code <> '-1') { |
|
241 | + if ($paramcount != 0) $sql .= ' AND'; |
|
242 | + else $sql .= ' WHERE'; |
|
243 | + $sql .= " course_code = '".Database::escape_string($course_code)."'"; |
|
244 | + $paramcount ++; |
|
245 | + } |
|
246 | + |
|
247 | + if (isset ($category_id)) { |
|
248 | + if ($paramcount != 0) $sql .= ' AND'; |
|
249 | + else $sql .= ' WHERE'; |
|
250 | + $sql .= ' category_id = '.intval($category_id); |
|
251 | + $paramcount ++; |
|
252 | + } |
|
253 | + |
|
254 | + if (isset ($visible)) { |
|
255 | + if ($paramcount != 0) $sql .= ' AND'; |
|
256 | + else $sql .= ' WHERE'; |
|
257 | + $sql .= ' visible = '.intval($visible); |
|
258 | + $paramcount ++; |
|
259 | + } |
|
260 | + |
|
261 | + if (isset ($locked)) { |
|
262 | + if ($paramcount != 0) $sql .= ' AND'; |
|
263 | + else $sql .= ' WHERE'; |
|
264 | + $sql .= ' locked = '.intval($locked); |
|
265 | + } |
|
266 | + |
|
267 | + $result = Database::query($sql); |
|
268 | + $alleval = Evaluation::create_evaluation_objects_from_sql_result($result); |
|
269 | + |
|
270 | + return $alleval; |
|
271 | + } |
|
272 | + |
|
273 | + |
|
274 | + |
|
275 | + /** |
|
276 | + * @param array $result |
|
277 | + * @return array |
|
278 | + */ |
|
279 | + private static function create_evaluation_objects_from_sql_result($result) |
|
280 | + { |
|
281 | + $alleval = array(); |
|
282 | + if (Database::num_rows($result)) { |
|
283 | + while ($data = Database::fetch_array($result)) { |
|
284 | + $eval= new Evaluation(); |
|
285 | + $eval->set_id($data['id']); |
|
286 | + $eval->set_name($data['name']); |
|
287 | + $eval->set_description($data['description']); |
|
288 | + $eval->set_user_id($data['user_id']); |
|
289 | + $eval->set_course_code($data['course_code']); |
|
290 | + $eval->set_category_id($data['category_id']); |
|
291 | + $eval->set_date(api_get_local_time($data['created_at'])); |
|
292 | + $eval->set_weight($data['weight']); |
|
293 | + $eval->set_max($data['max']); |
|
294 | + $eval->set_visible($data['visible']); |
|
295 | + $eval->set_type($data['type']); |
|
296 | + $eval->set_locked($data['locked']); |
|
297 | + $eval->setSessionId(api_get_session_id()); |
|
298 | + |
|
299 | + $alleval[] = $eval; |
|
300 | + } |
|
301 | + } |
|
302 | + |
|
303 | + return $alleval; |
|
304 | + } |
|
305 | + |
|
306 | + /** |
|
307 | + * Insert this evaluation into the database |
|
308 | + */ |
|
309 | + public function add() |
|
310 | + { |
|
311 | + if (isset($this->name) && |
|
312 | + isset($this->user_id) && |
|
313 | + isset($this->weight) && |
|
314 | + isset ($this->eval_max) && |
|
315 | + isset($this->visible) |
|
316 | + ) { |
|
317 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
318 | + |
|
319 | + $sql = 'INSERT INTO '.$tbl_grade_evaluations |
|
320 | + .' (name, user_id, weight, max, visible'; |
|
321 | + if (isset($this->description)) { |
|
322 | + $sql .= ',description'; |
|
323 | + } |
|
324 | + if (isset($this->course_code)) { |
|
325 | + $sql .= ', course_code'; |
|
326 | + } |
|
327 | + if (isset($this->category)) { |
|
328 | + $sql .= ', category_id'; |
|
329 | + } |
|
330 | + $sql .= ', created_at'; |
|
331 | + $sql .= ',type'; |
|
332 | + $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'" |
|
333 | + .','.intval($this->get_user_id()) |
|
334 | + .','.floatval($this->get_weight()) |
|
335 | + .','.intval($this->get_max()) |
|
336 | + .','.intval($this->is_visible()); |
|
337 | + if (isset($this->description)) { |
|
338 | + $sql .= ",'".Database::escape_string($this->get_description())."'"; |
|
339 | + } |
|
340 | + if (isset($this->course_code)) { |
|
341 | + $sql .= ",'".Database::escape_string($this->get_course_code())."'"; |
|
342 | + } |
|
343 | + if (isset($this->category)) { |
|
344 | + $sql .= ','.intval($this->get_category_id()); |
|
345 | + } |
|
346 | + if (empty($this->type)) { |
|
347 | + $this->type = 'evaluation'; |
|
348 | + } |
|
349 | + $sql .= ", '".api_get_utc_datetime()."'"; |
|
350 | + $sql .= ',\''.Database::escape_string($this->type).'\''; |
|
351 | + $sql .= ")"; |
|
352 | + |
|
353 | + Database::query($sql); |
|
354 | + $this->set_id(Database::insert_id()); |
|
355 | + } else { |
|
356 | + die('Error in Evaluation add: required field empty'); |
|
357 | + } |
|
358 | + } |
|
359 | + |
|
360 | + /** |
|
361 | + * @param int $idevaluation |
|
362 | + */ |
|
363 | + public function add_evaluation_log($idevaluation) |
|
364 | + { |
|
365 | + if (!empty($idevaluation)) { |
|
366 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
367 | + $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); |
|
368 | + $eval = new Evaluation(); |
|
369 | + $dateobject = $eval->load($idevaluation,null,null,null,null); |
|
370 | + $arreval = get_object_vars($dateobject[0]); |
|
371 | + if (!empty($arreval['id'])) { |
|
372 | + $sql = 'SELECT weight from '.$tbl_grade_evaluations.' |
|
373 | 373 | WHERE id='.$arreval['id']; |
374 | 374 | $rs = Database::query($sql); |
375 | 375 | $row_old_weight = Database::fetch_array($rs, 'ASSOC'); |
@@ -385,426 +385,426 @@ discard block |
||
385 | 385 | 'user_id_log' => api_get_user_id() |
386 | 386 | ]; |
387 | 387 | Database::insert($tbl_grade_linkeval_log, $params); |
388 | - } |
|
389 | - } |
|
390 | - } |
|
391 | - |
|
392 | - /** |
|
393 | - * Update the properties of this evaluation in the database |
|
394 | - */ |
|
395 | - public function save() |
|
396 | - { |
|
397 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
398 | - $sql = 'UPDATE '.$tbl_grade_evaluations |
|
399 | - ." SET name = '".Database::escape_string($this->get_name())."'" |
|
400 | - .', description = '; |
|
401 | - if (isset($this->description)) { |
|
402 | - $sql .= "'".Database::escape_string($this->get_description())."'"; |
|
403 | - }else { |
|
404 | - $sql .= 'null'; |
|
405 | - } |
|
406 | - $sql .= ', user_id = '.intval($this->get_user_id()) |
|
407 | - .', course_code = '; |
|
408 | - if (isset($this->course_code)) { |
|
409 | - $sql .= "'".Database::escape_string($this->get_course_code())."'"; |
|
410 | - } else { |
|
411 | - $sql .= 'null'; |
|
412 | - } |
|
413 | - $sql .= ', category_id = '; |
|
414 | - if (isset($this->category)) { |
|
415 | - $sql .= intval($this->get_category_id()); |
|
416 | - } else { |
|
417 | - $sql .= 'null'; |
|
418 | - } |
|
419 | - $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" ' |
|
420 | - .', max = '.intval($this->get_max()) |
|
421 | - .', visible = '.intval($this->is_visible()) |
|
422 | - .' WHERE id = '.intval($this->id); |
|
423 | - //recorded history |
|
424 | - |
|
425 | - $eval_log = new Evaluation(); |
|
426 | - $eval_log->add_evaluation_log($this->id); |
|
427 | - Database::query($sql); |
|
428 | - } |
|
429 | - |
|
430 | - /** |
|
431 | - * Delete this evaluation from the database |
|
432 | - */ |
|
433 | - public function delete() |
|
434 | - { |
|
435 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
436 | - $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id); |
|
437 | - Database::query($sql); |
|
438 | - } |
|
439 | - |
|
440 | - /** |
|
441 | - * Check if an evaluation name (with the same parent category) already exists |
|
442 | - * @param $name name to check (if not given, the name property of this object will be checked) |
|
443 | - * @param $parent parent category |
|
444 | - */ |
|
445 | - public function does_name_exist($name, $parent) |
|
446 | - { |
|
447 | - if (!isset ($name)) { |
|
448 | - $name = $this->name; |
|
449 | - $parent = $this->category; |
|
450 | - } |
|
451 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
452 | - $sql = 'SELECT count(id) AS number' |
|
453 | - .' FROM '.$tbl_grade_evaluations |
|
454 | - ." WHERE name = '".Database::escape_string($name)."'"; |
|
455 | - |
|
456 | - if (api_is_allowed_to_edit()) { |
|
457 | - $parent = Category::load($parent); |
|
458 | - $code = $parent[0]->get_course_code(); |
|
459 | - $courseInfo = api_get_course_info($code); |
|
460 | - $courseId = $courseInfo['real_id']; |
|
461 | - |
|
462 | - if (isset($code) && $code != '0') { |
|
463 | - $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); |
|
464 | - $sql .= ' AND user_id IN ( |
|
388 | + } |
|
389 | + } |
|
390 | + } |
|
391 | + |
|
392 | + /** |
|
393 | + * Update the properties of this evaluation in the database |
|
394 | + */ |
|
395 | + public function save() |
|
396 | + { |
|
397 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
398 | + $sql = 'UPDATE '.$tbl_grade_evaluations |
|
399 | + ." SET name = '".Database::escape_string($this->get_name())."'" |
|
400 | + .', description = '; |
|
401 | + if (isset($this->description)) { |
|
402 | + $sql .= "'".Database::escape_string($this->get_description())."'"; |
|
403 | + }else { |
|
404 | + $sql .= 'null'; |
|
405 | + } |
|
406 | + $sql .= ', user_id = '.intval($this->get_user_id()) |
|
407 | + .', course_code = '; |
|
408 | + if (isset($this->course_code)) { |
|
409 | + $sql .= "'".Database::escape_string($this->get_course_code())."'"; |
|
410 | + } else { |
|
411 | + $sql .= 'null'; |
|
412 | + } |
|
413 | + $sql .= ', category_id = '; |
|
414 | + if (isset($this->category)) { |
|
415 | + $sql .= intval($this->get_category_id()); |
|
416 | + } else { |
|
417 | + $sql .= 'null'; |
|
418 | + } |
|
419 | + $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" ' |
|
420 | + .', max = '.intval($this->get_max()) |
|
421 | + .', visible = '.intval($this->is_visible()) |
|
422 | + .' WHERE id = '.intval($this->id); |
|
423 | + //recorded history |
|
424 | + |
|
425 | + $eval_log = new Evaluation(); |
|
426 | + $eval_log->add_evaluation_log($this->id); |
|
427 | + Database::query($sql); |
|
428 | + } |
|
429 | + |
|
430 | + /** |
|
431 | + * Delete this evaluation from the database |
|
432 | + */ |
|
433 | + public function delete() |
|
434 | + { |
|
435 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
436 | + $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id); |
|
437 | + Database::query($sql); |
|
438 | + } |
|
439 | + |
|
440 | + /** |
|
441 | + * Check if an evaluation name (with the same parent category) already exists |
|
442 | + * @param $name name to check (if not given, the name property of this object will be checked) |
|
443 | + * @param $parent parent category |
|
444 | + */ |
|
445 | + public function does_name_exist($name, $parent) |
|
446 | + { |
|
447 | + if (!isset ($name)) { |
|
448 | + $name = $this->name; |
|
449 | + $parent = $this->category; |
|
450 | + } |
|
451 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
452 | + $sql = 'SELECT count(id) AS number' |
|
453 | + .' FROM '.$tbl_grade_evaluations |
|
454 | + ." WHERE name = '".Database::escape_string($name)."'"; |
|
455 | + |
|
456 | + if (api_is_allowed_to_edit()) { |
|
457 | + $parent = Category::load($parent); |
|
458 | + $code = $parent[0]->get_course_code(); |
|
459 | + $courseInfo = api_get_course_info($code); |
|
460 | + $courseId = $courseInfo['real_id']; |
|
461 | + |
|
462 | + if (isset($code) && $code != '0') { |
|
463 | + $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); |
|
464 | + $sql .= ' AND user_id IN ( |
|
465 | 465 | SELECT user_id FROM '.$main_course_user_table.' |
466 | 466 | WHERE |
467 | 467 | c_id = '.$courseId.' AND |
468 | 468 | status = '.COURSEMANAGER.' |
469 | 469 | )'; |
470 | - } else { |
|
471 | - $sql .= ' AND user_id = '.api_get_user_id(); |
|
472 | - } |
|
473 | - |
|
474 | - }else { |
|
475 | - $sql .= ' AND user_id = '.api_get_user_id(); |
|
476 | - } |
|
477 | - |
|
478 | - if (!isset ($parent)) { |
|
479 | - $sql.= ' AND category_id is null'; |
|
480 | - } else { |
|
481 | - $sql.= ' AND category_id = '.intval($parent); |
|
482 | - } |
|
483 | - $result = Database::query($sql); |
|
484 | - $number=Database::fetch_row($result); |
|
485 | - |
|
486 | - return $number[0] != 0; |
|
487 | - } |
|
488 | - |
|
489 | - /** |
|
490 | - * Are there any results for this evaluation yet ? |
|
491 | - * The 'max' property should not be changed then. |
|
492 | - */ |
|
493 | - public function has_results() |
|
494 | - { |
|
495 | - $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
496 | - $sql = 'SELECT count(id) AS number |
|
470 | + } else { |
|
471 | + $sql .= ' AND user_id = '.api_get_user_id(); |
|
472 | + } |
|
473 | + |
|
474 | + }else { |
|
475 | + $sql .= ' AND user_id = '.api_get_user_id(); |
|
476 | + } |
|
477 | + |
|
478 | + if (!isset ($parent)) { |
|
479 | + $sql.= ' AND category_id is null'; |
|
480 | + } else { |
|
481 | + $sql.= ' AND category_id = '.intval($parent); |
|
482 | + } |
|
483 | + $result = Database::query($sql); |
|
484 | + $number=Database::fetch_row($result); |
|
485 | + |
|
486 | + return $number[0] != 0; |
|
487 | + } |
|
488 | + |
|
489 | + /** |
|
490 | + * Are there any results for this evaluation yet ? |
|
491 | + * The 'max' property should not be changed then. |
|
492 | + */ |
|
493 | + public function has_results() |
|
494 | + { |
|
495 | + $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
496 | + $sql = 'SELECT count(id) AS number |
|
497 | 497 | FROM '.$tbl_grade_results.' |
498 | 498 | WHERE evaluation_id = '.intval($this->id); |
499 | - $result = Database::query($sql); |
|
500 | - $number=Database::fetch_row($result); |
|
501 | - |
|
502 | - return ($number[0] != 0); |
|
503 | - } |
|
504 | - |
|
505 | - /** |
|
506 | - * Delete all results for this evaluation |
|
507 | - */ |
|
508 | - public function delete_results() |
|
509 | - { |
|
510 | - $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
511 | - $sql = 'DELETE FROM '.$tbl_grade_results.' |
|
499 | + $result = Database::query($sql); |
|
500 | + $number=Database::fetch_row($result); |
|
501 | + |
|
502 | + return ($number[0] != 0); |
|
503 | + } |
|
504 | + |
|
505 | + /** |
|
506 | + * Delete all results for this evaluation |
|
507 | + */ |
|
508 | + public function delete_results() |
|
509 | + { |
|
510 | + $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
511 | + $sql = 'DELETE FROM '.$tbl_grade_results.' |
|
512 | 512 | WHERE evaluation_id = '.intval($this->id); |
513 | - Database::query($sql); |
|
514 | - } |
|
515 | - |
|
516 | - /** |
|
517 | - * Delete this evaluation and all underlying results. |
|
518 | - */ |
|
519 | - public function delete_with_results() |
|
520 | - { |
|
521 | - $this->delete_results(); |
|
522 | - $this->delete(); |
|
523 | - } |
|
524 | - |
|
525 | - /** |
|
526 | - * Check if the given score is possible for this evaluation |
|
527 | - */ |
|
528 | - public function is_valid_score($score) |
|
529 | - { |
|
530 | - return is_numeric($score) && $score >= 0 && $score <= $this->eval_max; |
|
531 | - } |
|
532 | - |
|
533 | - /** |
|
534 | - * Calculate the score of this evaluation |
|
535 | - * @param int $stud_id (default: all students who have results for this eval - then the average is returned) |
|
536 | - * @param string $type (best, average, ranking) |
|
537 | - * @return array (score, max) if student is given |
|
538 | - * array (sum of scores, number of scores) otherwise |
|
539 | - * or null if no scores available |
|
540 | - */ |
|
541 | - public function calc_score($stud_id = null, $type = null) |
|
542 | - { |
|
513 | + Database::query($sql); |
|
514 | + } |
|
515 | + |
|
516 | + /** |
|
517 | + * Delete this evaluation and all underlying results. |
|
518 | + */ |
|
519 | + public function delete_with_results() |
|
520 | + { |
|
521 | + $this->delete_results(); |
|
522 | + $this->delete(); |
|
523 | + } |
|
524 | + |
|
525 | + /** |
|
526 | + * Check if the given score is possible for this evaluation |
|
527 | + */ |
|
528 | + public function is_valid_score($score) |
|
529 | + { |
|
530 | + return is_numeric($score) && $score >= 0 && $score <= $this->eval_max; |
|
531 | + } |
|
532 | + |
|
533 | + /** |
|
534 | + * Calculate the score of this evaluation |
|
535 | + * @param int $stud_id (default: all students who have results for this eval - then the average is returned) |
|
536 | + * @param string $type (best, average, ranking) |
|
537 | + * @return array (score, max) if student is given |
|
538 | + * array (sum of scores, number of scores) otherwise |
|
539 | + * or null if no scores available |
|
540 | + */ |
|
541 | + public function calc_score($stud_id = null, $type = null) |
|
542 | + { |
|
543 | 543 | $useSession = true; |
544 | - if (isset($stud_id) && empty($type)) { |
|
545 | - $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id; |
|
546 | - $data = Session::read('calc_score'); |
|
544 | + if (isset($stud_id) && empty($type)) { |
|
545 | + $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id; |
|
546 | + $data = Session::read('calc_score'); |
|
547 | 547 | $results = isset($data[$key]) ? $data[$key] : null; |
548 | 548 | |
549 | 549 | if ($useSession == false) { |
550 | 550 | $results = null; |
551 | 551 | } |
552 | - if (empty($results)) { |
|
553 | - $results = Result::load(null, $stud_id, $this->id); |
|
554 | - Session::write('calc_score', array($key => $results)); |
|
555 | - } |
|
556 | - |
|
557 | - $score = 0; |
|
558 | - /** @var Result $res */ |
|
559 | - foreach ($results as $res) { |
|
560 | - $score = $res->get_score(); |
|
561 | - } |
|
562 | - |
|
563 | - return array($score, $this->get_max()); |
|
564 | - } else { |
|
565 | - |
|
566 | - $count = 0; |
|
567 | - $sum = 0; |
|
568 | - $bestResult = 0; |
|
569 | - $weight = 0; |
|
570 | - $sumResult = 0; |
|
571 | - |
|
572 | - $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id; |
|
552 | + if (empty($results)) { |
|
553 | + $results = Result::load(null, $stud_id, $this->id); |
|
554 | + Session::write('calc_score', array($key => $results)); |
|
555 | + } |
|
556 | + |
|
557 | + $score = 0; |
|
558 | + /** @var Result $res */ |
|
559 | + foreach ($results as $res) { |
|
560 | + $score = $res->get_score(); |
|
561 | + } |
|
562 | + |
|
563 | + return array($score, $this->get_max()); |
|
564 | + } else { |
|
565 | + |
|
566 | + $count = 0; |
|
567 | + $sum = 0; |
|
568 | + $bestResult = 0; |
|
569 | + $weight = 0; |
|
570 | + $sumResult = 0; |
|
571 | + |
|
572 | + $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id; |
|
573 | 573 | $data = Session::read('calc_score'); |
574 | 574 | $allResults = isset($data[$key]) ? $data[$key] : null; |
575 | 575 | if ($useSession == false) { |
576 | 576 | $allResults = null; |
577 | 577 | } |
578 | - if (empty($allResults)) { |
|
579 | - $allResults = Result::load(null, null, $this->id); |
|
580 | - Session::write($key, $allResults); |
|
581 | - } |
|
582 | - |
|
583 | - $students = array(); |
|
584 | - /** @var Result $res */ |
|
585 | - foreach ($allResults as $res) { |
|
586 | - $score = $res->get_score(); |
|
587 | - if (!empty($score) || $score == '0') { |
|
588 | - $count++; |
|
589 | - $sum += $score / $this->get_max(); |
|
590 | - $sumResult += $score; |
|
591 | - if ($score > $bestResult) { |
|
592 | - $bestResult = $score; |
|
593 | - } |
|
594 | - $weight = $this->get_max(); |
|
595 | - } |
|
596 | - $students[$res->get_user_id()] = $score; |
|
597 | - } |
|
598 | - |
|
599 | - if (empty($count)) { |
|
600 | - return null; |
|
601 | - } |
|
602 | - |
|
603 | - switch ($type) { |
|
604 | - case 'best': |
|
605 | - return array($bestResult, $weight); |
|
606 | - break; |
|
607 | - case 'average': |
|
608 | - return array($sumResult/$count, $weight); |
|
609 | - break; |
|
610 | - case 'ranking': |
|
578 | + if (empty($allResults)) { |
|
579 | + $allResults = Result::load(null, null, $this->id); |
|
580 | + Session::write($key, $allResults); |
|
581 | + } |
|
582 | + |
|
583 | + $students = array(); |
|
584 | + /** @var Result $res */ |
|
585 | + foreach ($allResults as $res) { |
|
586 | + $score = $res->get_score(); |
|
587 | + if (!empty($score) || $score == '0') { |
|
588 | + $count++; |
|
589 | + $sum += $score / $this->get_max(); |
|
590 | + $sumResult += $score; |
|
591 | + if ($score > $bestResult) { |
|
592 | + $bestResult = $score; |
|
593 | + } |
|
594 | + $weight = $this->get_max(); |
|
595 | + } |
|
596 | + $students[$res->get_user_id()] = $score; |
|
597 | + } |
|
598 | + |
|
599 | + if (empty($count)) { |
|
600 | + return null; |
|
601 | + } |
|
602 | + |
|
603 | + switch ($type) { |
|
604 | + case 'best': |
|
605 | + return array($bestResult, $weight); |
|
606 | + break; |
|
607 | + case 'average': |
|
608 | + return array($sumResult/$count, $weight); |
|
609 | + break; |
|
610 | + case 'ranking': |
|
611 | 611 | $students = array(); |
612 | 612 | /** @var Result $res */ |
613 | 613 | foreach ($allResults as $res) { |
614 | 614 | $score = $res->get_score(); |
615 | 615 | $students[$res->get_user_id()] = $score; |
616 | 616 | } |
617 | - return AbstractLink::getCurrentUserRanking($stud_id, $students); |
|
618 | - break; |
|
619 | - default: |
|
620 | - return array($sum, $count); |
|
621 | - break; |
|
622 | - } |
|
623 | - } |
|
624 | - } |
|
625 | - |
|
626 | - /** |
|
627 | - * Generate an array of possible categories where this evaluation can be moved to. |
|
628 | - * Notice: its own parent will be included in the list: it's up to the frontend |
|
629 | - * to disable this element. |
|
630 | - * @return array 2-dimensional array - every element contains 3 subelements (id, name, level) |
|
631 | - */ |
|
632 | - public function get_target_categories() |
|
633 | - { |
|
634 | - // - course independent evaluation |
|
635 | - // -> movable to root or other course independent categories |
|
636 | - // - evaluation inside a course |
|
637 | - // -> movable to root, independent categories or categories inside the course |
|
638 | - $user = (api_is_platform_admin() ? null : api_get_user_id()); |
|
639 | - $targets = array(); |
|
640 | - $level = 0; |
|
641 | - |
|
642 | - $root = array(0, get_lang('RootCat'), $level); |
|
643 | - $targets[] = $root; |
|
644 | - |
|
645 | - if (isset($this->course_code) && !empty($this->course_code)) { |
|
646 | - $crscats = Category::load(null,null,$this->course_code,0); |
|
647 | - foreach ($crscats as $cat) { |
|
648 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
649 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
650 | - } |
|
651 | - } |
|
652 | - |
|
653 | - $indcats = Category::load(null,$user,0,0); |
|
654 | - foreach ($indcats as $cat) { |
|
655 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
656 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
657 | - } |
|
658 | - |
|
659 | - return $targets; |
|
660 | - } |
|
661 | - |
|
662 | - /** |
|
663 | - * Internal function used by get_target_categories() |
|
664 | - * @param integer $level |
|
665 | - */ |
|
666 | - private function add_target_subcategories($targets, $level, $catid) |
|
667 | - { |
|
668 | - $subcats = Category::load(null,null,null,$catid); |
|
669 | - foreach ($subcats as $cat) { |
|
670 | - $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
671 | - $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
672 | - } |
|
673 | - return $targets; |
|
674 | - } |
|
675 | - |
|
676 | - /** |
|
677 | - * Move this evaluation to the given category. |
|
678 | - * If this evaluation moves from inside a course to outside, |
|
679 | - * its course code is also changed. |
|
680 | - */ |
|
681 | - public function move_to_cat($cat) |
|
682 | - { |
|
683 | - $this->set_category_id($cat->get_id()); |
|
684 | - if ($this->get_course_code() != $cat->get_course_code()) { |
|
685 | - $this->set_course_code($cat->get_course_code()); |
|
686 | - } |
|
687 | - $this->save(); |
|
688 | - } |
|
689 | - |
|
690 | - /** |
|
691 | - * Retrieve evaluations where a student has results for |
|
692 | - * and return them as an array of Evaluation objects |
|
693 | - * @param int $cat_id parent category (use 'null' to retrieve them in all categories) |
|
694 | - * @param int $stud_id student id |
|
695 | - */ |
|
696 | - public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id) |
|
697 | - { |
|
698 | - $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
699 | - $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
700 | - |
|
701 | - $sql = 'SELECT * FROM '.$tbl_grade_evaluations.' |
|
617 | + return AbstractLink::getCurrentUserRanking($stud_id, $students); |
|
618 | + break; |
|
619 | + default: |
|
620 | + return array($sum, $count); |
|
621 | + break; |
|
622 | + } |
|
623 | + } |
|
624 | + } |
|
625 | + |
|
626 | + /** |
|
627 | + * Generate an array of possible categories where this evaluation can be moved to. |
|
628 | + * Notice: its own parent will be included in the list: it's up to the frontend |
|
629 | + * to disable this element. |
|
630 | + * @return array 2-dimensional array - every element contains 3 subelements (id, name, level) |
|
631 | + */ |
|
632 | + public function get_target_categories() |
|
633 | + { |
|
634 | + // - course independent evaluation |
|
635 | + // -> movable to root or other course independent categories |
|
636 | + // - evaluation inside a course |
|
637 | + // -> movable to root, independent categories or categories inside the course |
|
638 | + $user = (api_is_platform_admin() ? null : api_get_user_id()); |
|
639 | + $targets = array(); |
|
640 | + $level = 0; |
|
641 | + |
|
642 | + $root = array(0, get_lang('RootCat'), $level); |
|
643 | + $targets[] = $root; |
|
644 | + |
|
645 | + if (isset($this->course_code) && !empty($this->course_code)) { |
|
646 | + $crscats = Category::load(null,null,$this->course_code,0); |
|
647 | + foreach ($crscats as $cat) { |
|
648 | + $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
649 | + $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
650 | + } |
|
651 | + } |
|
652 | + |
|
653 | + $indcats = Category::load(null,$user,0,0); |
|
654 | + foreach ($indcats as $cat) { |
|
655 | + $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
656 | + $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
657 | + } |
|
658 | + |
|
659 | + return $targets; |
|
660 | + } |
|
661 | + |
|
662 | + /** |
|
663 | + * Internal function used by get_target_categories() |
|
664 | + * @param integer $level |
|
665 | + */ |
|
666 | + private function add_target_subcategories($targets, $level, $catid) |
|
667 | + { |
|
668 | + $subcats = Category::load(null,null,null,$catid); |
|
669 | + foreach ($subcats as $cat) { |
|
670 | + $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1); |
|
671 | + $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id()); |
|
672 | + } |
|
673 | + return $targets; |
|
674 | + } |
|
675 | + |
|
676 | + /** |
|
677 | + * Move this evaluation to the given category. |
|
678 | + * If this evaluation moves from inside a course to outside, |
|
679 | + * its course code is also changed. |
|
680 | + */ |
|
681 | + public function move_to_cat($cat) |
|
682 | + { |
|
683 | + $this->set_category_id($cat->get_id()); |
|
684 | + if ($this->get_course_code() != $cat->get_course_code()) { |
|
685 | + $this->set_course_code($cat->get_course_code()); |
|
686 | + } |
|
687 | + $this->save(); |
|
688 | + } |
|
689 | + |
|
690 | + /** |
|
691 | + * Retrieve evaluations where a student has results for |
|
692 | + * and return them as an array of Evaluation objects |
|
693 | + * @param int $cat_id parent category (use 'null' to retrieve them in all categories) |
|
694 | + * @param int $stud_id student id |
|
695 | + */ |
|
696 | + public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id) |
|
697 | + { |
|
698 | + $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
699 | + $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
700 | + |
|
701 | + $sql = 'SELECT * FROM '.$tbl_grade_evaluations.' |
|
702 | 702 | WHERE id IN ( |
703 | 703 | SELECT evaluation_id FROM '.$tbl_grade_results.' |
704 | 704 | WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL |
705 | 705 | )'; |
706 | - if (!api_is_allowed_to_edit()) { |
|
707 | - $sql .= ' AND visible = 1'; |
|
708 | - } |
|
709 | - if (isset($cat_id)) { |
|
710 | - $sql .= ' AND category_id = '.intval($cat_id); |
|
711 | - } else { |
|
712 | - $sql .= ' AND category_id >= 0'; |
|
713 | - } |
|
714 | - |
|
715 | - $result = Database::query($sql); |
|
716 | - $alleval = Evaluation::create_evaluation_objects_from_sql_result($result); |
|
717 | - |
|
718 | - return $alleval; |
|
719 | - } |
|
720 | - |
|
721 | - /** |
|
722 | - * Get a list of students that do not have a result record for this evaluation |
|
723 | - */ |
|
724 | - public function get_not_subscribed_students($first_letter_user = '') |
|
725 | - { |
|
726 | - $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
727 | - $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
728 | - |
|
729 | - $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user |
|
730 | - ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'" |
|
731 | - .' AND status = '.STUDENT |
|
732 | - .' AND user_id NOT IN' |
|
733 | - .' (SELECT user_id FROM '.$tbl_grade_results |
|
734 | - .' WHERE evaluation_id = '.intval($this->id) |
|
735 | - .' )' |
|
736 | - .' ORDER BY lastname'; |
|
737 | - |
|
738 | - $result = Database::query($sql); |
|
739 | - $users = Database::store_result($result); |
|
740 | - |
|
741 | - return $users; |
|
742 | - } |
|
743 | - |
|
744 | - /** |
|
745 | - * Find evaluations by name |
|
746 | - * @param string $name_mask search string |
|
747 | - * @return array evaluation objects matching the search criterium |
|
748 | - * @todo can be written more efficiently using a new (but very complex) sql query |
|
749 | - */ |
|
750 | - public function find_evaluations($name_mask,$selectcat) |
|
751 | - { |
|
752 | - $rootcat = Category::load($selectcat); |
|
753 | - $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true); |
|
754 | - $foundevals = array(); |
|
755 | - foreach ($evals as $eval) { |
|
756 | - if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) { |
|
757 | - $foundevals[] = $eval; |
|
758 | - } |
|
759 | - } |
|
760 | - return $foundevals; |
|
761 | - } |
|
762 | - |
|
763 | - public function get_item_type() |
|
764 | - { |
|
765 | - return 'E'; |
|
766 | - } |
|
767 | - |
|
768 | - public function get_icon_name() |
|
769 | - { |
|
770 | - return $this->has_results() ? 'evalnotempty' : 'evalempty'; |
|
771 | - } |
|
772 | - |
|
773 | - /** |
|
774 | - * Locks an evaluation, only one who can unlock it is the platform administrator. |
|
775 | - * @param int locked 1 or unlocked 0 |
|
776 | - * |
|
777 | - **/ |
|
778 | - function lock($locked) |
|
779 | - { |
|
780 | - $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
781 | - $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'"; |
|
782 | - Database::query($sql); |
|
783 | - } |
|
784 | - |
|
785 | - function check_lock_permissions() |
|
786 | - { |
|
787 | - if (api_is_platform_admin()) { |
|
788 | - return true; |
|
789 | - } else { |
|
790 | - if ($this->is_locked()) { |
|
791 | - api_not_allowed(); |
|
792 | - } |
|
793 | - } |
|
794 | - } |
|
795 | - |
|
796 | - function delete_linked_data() |
|
797 | - { |
|
798 | - |
|
799 | - } |
|
706 | + if (!api_is_allowed_to_edit()) { |
|
707 | + $sql .= ' AND visible = 1'; |
|
708 | + } |
|
709 | + if (isset($cat_id)) { |
|
710 | + $sql .= ' AND category_id = '.intval($cat_id); |
|
711 | + } else { |
|
712 | + $sql .= ' AND category_id >= 0'; |
|
713 | + } |
|
714 | + |
|
715 | + $result = Database::query($sql); |
|
716 | + $alleval = Evaluation::create_evaluation_objects_from_sql_result($result); |
|
717 | + |
|
718 | + return $alleval; |
|
719 | + } |
|
720 | + |
|
721 | + /** |
|
722 | + * Get a list of students that do not have a result record for this evaluation |
|
723 | + */ |
|
724 | + public function get_not_subscribed_students($first_letter_user = '') |
|
725 | + { |
|
726 | + $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
727 | + $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT); |
|
728 | + |
|
729 | + $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user |
|
730 | + ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'" |
|
731 | + .' AND status = '.STUDENT |
|
732 | + .' AND user_id NOT IN' |
|
733 | + .' (SELECT user_id FROM '.$tbl_grade_results |
|
734 | + .' WHERE evaluation_id = '.intval($this->id) |
|
735 | + .' )' |
|
736 | + .' ORDER BY lastname'; |
|
737 | + |
|
738 | + $result = Database::query($sql); |
|
739 | + $users = Database::store_result($result); |
|
740 | + |
|
741 | + return $users; |
|
742 | + } |
|
743 | + |
|
744 | + /** |
|
745 | + * Find evaluations by name |
|
746 | + * @param string $name_mask search string |
|
747 | + * @return array evaluation objects matching the search criterium |
|
748 | + * @todo can be written more efficiently using a new (but very complex) sql query |
|
749 | + */ |
|
750 | + public function find_evaluations($name_mask,$selectcat) |
|
751 | + { |
|
752 | + $rootcat = Category::load($selectcat); |
|
753 | + $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true); |
|
754 | + $foundevals = array(); |
|
755 | + foreach ($evals as $eval) { |
|
756 | + if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) { |
|
757 | + $foundevals[] = $eval; |
|
758 | + } |
|
759 | + } |
|
760 | + return $foundevals; |
|
761 | + } |
|
762 | + |
|
763 | + public function get_item_type() |
|
764 | + { |
|
765 | + return 'E'; |
|
766 | + } |
|
767 | + |
|
768 | + public function get_icon_name() |
|
769 | + { |
|
770 | + return $this->has_results() ? 'evalnotempty' : 'evalempty'; |
|
771 | + } |
|
772 | + |
|
773 | + /** |
|
774 | + * Locks an evaluation, only one who can unlock it is the platform administrator. |
|
775 | + * @param int locked 1 or unlocked 0 |
|
776 | + * |
|
777 | + **/ |
|
778 | + function lock($locked) |
|
779 | + { |
|
780 | + $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION); |
|
781 | + $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'"; |
|
782 | + Database::query($sql); |
|
783 | + } |
|
784 | + |
|
785 | + function check_lock_permissions() |
|
786 | + { |
|
787 | + if (api_is_platform_admin()) { |
|
788 | + return true; |
|
789 | + } else { |
|
790 | + if ($this->is_locked()) { |
|
791 | + api_not_allowed(); |
|
792 | + } |
|
793 | + } |
|
794 | + } |
|
795 | + |
|
796 | + function delete_linked_data() |
|
797 | + { |
|
798 | + |
|
799 | + } |
|
800 | 800 | |
801 | 801 | public function getStudentList() |
802 | 802 | { |
803 | 803 | return $this->studentList; |
804 | 804 | } |
805 | 805 | |
806 | - public function setStudentList($list) |
|
807 | - { |
|
808 | - $this->studentList = $list; |
|
809 | - } |
|
806 | + public function setStudentList($list) |
|
807 | + { |
|
808 | + $this->studentList = $list; |
|
809 | + } |
|
810 | 810 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | /** |
39 | 39 | * Get total number of results (rows) |
40 | 40 | */ |
41 | - public function get_total_results_count () |
|
41 | + public function get_total_results_count() |
|
42 | 42 | { |
43 | 43 | return count($this->results); |
44 | 44 | } |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | * 4 ['score'] : student's score |
54 | 54 | * 5 ['display'] : custom score display (only if custom scoring enabled) |
55 | 55 | */ |
56 | - public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false) |
|
56 | + public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false) |
|
57 | 57 | { |
58 | 58 | // do some checks on count, redefine if invalid value |
59 | 59 | $number_decimals = api_get_setting('gradebook_number_decimals'); |
60 | 60 | if (!isset($count)) { |
61 | - $count = count ($this->results) - $start; |
|
61 | + $count = count($this->results) - $start; |
|
62 | 62 | } |
63 | 63 | if ($count < 0) { |
64 | 64 | $count = 0; |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | $scoredisplay = ScoreDisplay :: instance(); |
67 | 67 | // generate actual data array |
68 | 68 | $table = array(); |
69 | - foreach($this->results as $result) { |
|
69 | + foreach ($this->results as $result) { |
|
70 | 70 | $user = array(); |
71 | 71 | $info = api_get_user_info($result->get_user_id()); |
72 | 72 | $user['id'] = $result->get_user_id(); |
73 | - if ($pdf){ |
|
73 | + if ($pdf) { |
|
74 | 74 | $user['username'] = $info['username']; |
75 | 75 | } |
76 | 76 | $user['result_id'] = $result->get_id(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | true |
93 | 93 | ) |
94 | 94 | ); |
95 | - if ($pdf && $number_decimals == null){ |
|
95 | + if ($pdf && $number_decimals == null) { |
|
96 | 96 | $user['scoreletter'] = $result->get_score(); |
97 | 97 | } |
98 | 98 | if ($scoredisplay->is_custom()) { |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | * @param bool Whether we want to ignore the score color |
133 | 133 | * @result string The score as we want to show it |
134 | 134 | */ |
135 | - private function get_score_display ($score, $realscore, $ignore_score_color = false) |
|
135 | + private function get_score_display($score, $realscore, $ignore_score_color = false) |
|
136 | 136 | { |
137 | 137 | if ($score != null) { |
138 | 138 | $scoredisplay = ScoreDisplay :: instance(); |
139 | 139 | $type = SCORE_CUSTOM; |
140 | 140 | if ($realscore === true) { |
141 | - $type = SCORE_DIV_PERCENT ; |
|
141 | + $type = SCORE_DIV_PERCENT; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return $scoredisplay->display_score( |
@@ -172,10 +172,10 @@ discard block |
||
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
175 | - function sort_by_mask ($item1, $item2) |
|
175 | + function sort_by_mask($item1, $item2) |
|
176 | 176 | { |
177 | - $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null); |
|
178 | - $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null); |
|
177 | + $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null); |
|
178 | + $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null); |
|
179 | 179 | return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2); |
180 | 180 | } |
181 | 181 | } |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | isset($this->params['only_subcat']) && |
115 | 115 | $this->params['only_subcat'] == $this->category->get_id() |
116 | 116 | ) { |
117 | - $main_weight = $this->category->get_weight(); |
|
117 | + $main_weight = $this->category->get_weight(); |
|
118 | 118 | $grade_model_id = $this->category->get_grade_model_id(); |
119 | 119 | } else { |
120 | - $main_cat = Category::load($parent_id, null, null); |
|
120 | + $main_cat = Category::load($parent_id, null, null); |
|
121 | 121 | $main_weight = $main_cat[0]->get_weight(); |
122 | 122 | $grade_model_id = $main_cat[0]->get_grade_model_id(); |
123 | 123 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | $list = []; |
200 | 200 | $list['items'] = $finalList; |
201 | 201 | $list['header'] = '<center>'.$mainHeader.'</center>'; |
202 | - $headers[]= $list; |
|
202 | + $headers[] = $list; |
|
203 | 203 | } else { |
204 | 204 | $headers[] = '<center>'.$mainHeader.'</center>'; |
205 | 205 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | (isset($this->params['only_total_category']) && |
210 | 210 | $this->params['only_total_category'] == false) |
211 | 211 | ) { |
212 | - for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) { |
|
212 | + for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) { |
|
213 | 213 | /** @var AbstractLink $item */ |
214 | 214 | $item = $this->evals_links[$count + $items_start]; |
215 | 215 | $weight = round(100 * $item->get_weight() / $main_weight, 1); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | !in_array($item->get_id(), $evaluationsAdded) |
228 | 228 | ) { |
229 | 229 | $weight = round(100 * $item->get_weight() / $main_weight, 1); |
230 | - $headers[] = $item->get_name() . ' ' . $weight . ' % '; |
|
230 | + $headers[] = $item->get_name().' '.$weight.' % '; |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | if (!isset($items_count)) { |
267 | 267 | $items_count = count($this->evals_links) - $items_start; |
268 | 268 | } |
269 | - for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) { |
|
269 | + for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) { |
|
270 | 270 | $item = $this->evals_links [$count + $items_start]; |
271 | 271 | $headers[] = $item->get_name(); |
272 | 272 | } |
@@ -293,13 +293,13 @@ discard block |
||
293 | 293 | ) { |
294 | 294 | // Do some checks on users/items counts, redefine if invalid values |
295 | 295 | if (!isset($users_count)) { |
296 | - $users_count = count ($this->users) - $users_start; |
|
296 | + $users_count = count($this->users) - $users_start; |
|
297 | 297 | } |
298 | 298 | if ($users_count < 0) { |
299 | 299 | $users_count = 0; |
300 | 300 | } |
301 | 301 | if (!isset($items_count)) { |
302 | - $items_count = count ($this->evals) + count ($this->links) - $items_start; |
|
302 | + $items_count = count($this->evals) + count($this->links) - $items_start; |
|
303 | 303 | } |
304 | 304 | if ($items_count < 0) { |
305 | 305 | $items_count = 0; |
@@ -312,10 +312,10 @@ discard block |
||
312 | 312 | |
313 | 313 | // sort users array |
314 | 314 | if ($users_sorting & self :: FVDG_SORT_LASTNAME) { |
315 | - usort($userTable, array('FlatViewDataGenerator','sort_by_last_name')); |
|
315 | + usort($userTable, array('FlatViewDataGenerator', 'sort_by_last_name')); |
|
316 | 316 | |
317 | 317 | } elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) { |
318 | - usort($userTable, array('FlatViewDataGenerator','sort_by_first_name')); |
|
318 | + usort($userTable, array('FlatViewDataGenerator', 'sort_by_first_name')); |
|
319 | 319 | } |
320 | 320 | |
321 | 321 | if ($users_sorting & self :: FVDG_SORT_DESC) { |
@@ -356,10 +356,10 @@ discard block |
||
356 | 356 | $parent_id = $this->category->get_parent_id(); |
357 | 357 | |
358 | 358 | if ($parent_id == 0 or $this->params['only_subcat'] == $this->category->get_id()) { |
359 | - $main_weight = $this->category->get_weight(); |
|
359 | + $main_weight = $this->category->get_weight(); |
|
360 | 360 | $grade_model_id = $this->category->get_grade_model_id(); |
361 | 361 | } else { |
362 | - $main_cat = Category::load($parent_id, null, null); |
|
362 | + $main_cat = Category::load($parent_id, null, null); |
|
363 | 363 | $main_weight = $main_cat[0]->get_weight(); |
364 | 364 | $grade_model_id = $main_cat[0]->get_grade_model_id(); |
365 | 365 | } |
@@ -471,11 +471,11 @@ discard block |
||
471 | 471 | $divide = $score[1] == 0 ? 1 : $score[1]; |
472 | 472 | |
473 | 473 | $sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()]; |
474 | - $item_value = $score[0]/$divide*$main_weight; |
|
474 | + $item_value = $score[0] / $divide * $main_weight; |
|
475 | 475 | |
476 | 476 | // Fixing total when using one or multiple gradebooks |
477 | - $percentage = $sub_cat->get_weight()/($sub_cat_percentage) * $sub_cat_percentage/$this->category->get_weight(); |
|
478 | - $item_value = $percentage*$item_value; |
|
477 | + $percentage = $sub_cat->get_weight() / ($sub_cat_percentage) * $sub_cat_percentage / $this->category->get_weight(); |
|
478 | + $item_value = $percentage * $item_value; |
|
479 | 479 | $item_total += $sub_cat->get_weight(); |
480 | 480 | /* |
481 | 481 | if ($convert_using_the_global_weight) { |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | if ($convert_using_the_global_weight) { |
522 | 522 | //$item_total = $main_weight; |
523 | 523 | } |
524 | - } else { |
|
524 | + } else { |
|
525 | 525 | // All evaluations |
526 | 526 | $result = $this->parseEvaluations( |
527 | 527 | $user_id, |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | // Sub cat weight |
629 | 629 | //$sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()]; |
630 | 630 | |
631 | - $item_value = isset($score[0]) ? $score[0]/$divide : 0; |
|
631 | + $item_value = isset($score[0]) ? $score[0] / $divide : 0; |
|
632 | 632 | |
633 | 633 | // Fixing total when using one or multiple gradebooks. |
634 | 634 | if (empty($parentCategoryIdFilter)) { |
@@ -710,11 +710,11 @@ discard block |
||
710 | 710 | $data = array(); |
711 | 711 | |
712 | 712 | foreach ($selected_users as $user) { |
713 | - $row = array (); |
|
714 | - for ($count=0;$count < count($this->evals_links); $count++) { |
|
713 | + $row = array(); |
|
714 | + for ($count = 0; $count < count($this->evals_links); $count++) { |
|
715 | 715 | $item = $this->evals_links [$count]; |
716 | 716 | $score = $item->calc_score($user[0]); |
717 | - $porcent_score = isset($score[1]) && $score[1] > 0 ? ($score[0]*100)/$score[1] :0; |
|
717 | + $porcent_score = isset($score[1]) && $score[1] > 0 ? ($score[0] * 100) / $score[1] : 0; |
|
718 | 718 | $row[$item->get_name()] = $porcent_score; |
719 | 719 | } |
720 | 720 | $data[$user[0]] = $row; |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | $tmp = array(); |
727 | 727 | foreach ($items as $item => $value) { |
728 | 728 | $tmp[] = $item; |
729 | - if (in_array($item,$tmp)) { |
|
729 | + if (in_array($item, $tmp)) { |
|
730 | 730 | $data_by_item[$item][$uid] = $value; |
731 | 731 | } |
732 | 732 | } |
@@ -737,7 +737,7 @@ discard block |
||
737 | 737 | */ |
738 | 738 | $result = array(); |
739 | 739 | foreach ($data_by_item as $k => $v) { |
740 | - $average = round(array_sum($v)/count($v)); |
|
740 | + $average = round(array_sum($v) / count($v)); |
|
741 | 741 | arsort($v); |
742 | 742 | $maximum = array_shift($v); |
743 | 743 | $minimum = array_pop($v); |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | $minimum = 0; |
747 | 747 | } |
748 | 748 | |
749 | - $summary= array( |
|
749 | + $summary = array( |
|
750 | 750 | 'max' => $maximum, |
751 | 751 | 'min' => $minimum, |
752 | 752 | 'avg' => $average |
@@ -763,32 +763,32 @@ discard block |
||
763 | 763 | public function get_data_to_graph() |
764 | 764 | { |
765 | 765 | // do some checks on users/items counts, redefine if invalid values |
766 | - $usertable = array (); |
|
766 | + $usertable = array(); |
|
767 | 767 | foreach ($this->users as $user) { |
768 | 768 | $usertable[] = $user; |
769 | 769 | } |
770 | 770 | // sort users array |
771 | - usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name')); |
|
771 | + usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name')); |
|
772 | 772 | |
773 | - $data = array (); |
|
773 | + $data = array(); |
|
774 | 774 | |
775 | 775 | $selected_users = $usertable; |
776 | 776 | foreach ($selected_users as $user) { |
777 | - $row = array (); |
|
778 | - $row[] = $user[0]; // user id |
|
777 | + $row = array(); |
|
778 | + $row[] = $user[0]; // user id |
|
779 | 779 | $item_value = 0; |
780 | 780 | $item_total = 0; |
781 | 781 | |
782 | - for ($count=0;$count < count($this->evals_links); $count++) { |
|
782 | + for ($count = 0; $count < count($this->evals_links); $count++) { |
|
783 | 783 | $item = $this->evals_links[$count]; |
784 | 784 | $score = $item->calc_score($user[0]); |
785 | 785 | |
786 | - $divide =( ($score[1])==0 ) ? 1 : $score[1]; |
|
787 | - $item_value += $score[0]/$divide*$item->get_weight(); |
|
786 | + $divide = (($score[1]) == 0) ? 1 : $score[1]; |
|
787 | + $item_value += $score[0] / $divide * $item->get_weight(); |
|
788 | 788 | $item_total += $item->get_weight(); |
789 | 789 | |
790 | 790 | |
791 | - $score_denom = ($score[1]==0) ? 1 : $score[1]; |
|
791 | + $score_denom = ($score[1] == 0) ? 1 : $score[1]; |
|
792 | 792 | $score_final = ($score[0] / $score_denom) * 100; |
793 | 793 | $row[] = $score_final; |
794 | 794 | } |
@@ -814,15 +814,15 @@ discard block |
||
814 | 814 | $usertable[] = $user; |
815 | 815 | } |
816 | 816 | // sort users array |
817 | - usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name')); |
|
817 | + usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name')); |
|
818 | 818 | |
819 | 819 | // generate actual data array |
820 | 820 | $scoredisplay = ScoreDisplay :: instance(); |
821 | 821 | $data = array(); |
822 | 822 | $selected_users = $usertable; |
823 | 823 | foreach ($selected_users as $user) { |
824 | - $row = array (); |
|
825 | - $row[] = $user[0]; // user id |
|
824 | + $row = array(); |
|
825 | + $row[] = $user[0]; // user id |
|
826 | 826 | $item_value = 0; |
827 | 827 | $item_total = 0; |
828 | 828 | $final_score = 0; |
@@ -843,8 +843,8 @@ discard block |
||
843 | 843 | $divide = $score[1] == 0 ? 1 : $score[1]; |
844 | 844 | |
845 | 845 | //$sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()]; |
846 | - $item_value = $score[0]/$divide*$main_weight; |
|
847 | - $item_total += $sub_cat->get_weight(); |
|
846 | + $item_value = $score[0] / $divide * $main_weight; |
|
847 | + $item_total += $sub_cat->get_weight(); |
|
848 | 848 | |
849 | 849 | $row[] = array( |
850 | 850 | $item_value, |
@@ -861,23 +861,23 @@ discard block |
||
861 | 861 | trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true)) |
862 | 862 | ); |
863 | 863 | } else { |
864 | - for ($count=0;$count < count($this->evals_links); $count++) { |
|
864 | + for ($count = 0; $count < count($this->evals_links); $count++) { |
|
865 | 865 | $item = $this->evals_links [$count]; |
866 | 866 | $score = $item->calc_score($user[0]); |
867 | 867 | $divide = ($score[1]) == 0 ? 1 : $score[1]; |
868 | 868 | $item_value += $score[0] / $divide * $item->get_weight(); |
869 | - $item_total+=$item->get_weight(); |
|
870 | - $score_denom=($score[1]==0) ? 1 : $score[1]; |
|
869 | + $item_total += $item->get_weight(); |
|
870 | + $score_denom = ($score[1] == 0) ? 1 : $score[1]; |
|
871 | 871 | $score_final = ($score[0] / $score_denom) * 100; |
872 | - $row[] = array ($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM,null, true))); |
|
872 | + $row[] = array($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM, null, true))); |
|
873 | 873 | |
874 | 874 | } |
875 | - $total_score=array($item_value,$item_total); |
|
875 | + $total_score = array($item_value, $item_total); |
|
876 | 876 | $score_final = ($item_value / $item_total) * 100; |
877 | 877 | if ($displayWarning) { |
878 | - Display::display_warning_message( Display::display_warning_message($total_score[1])); |
|
878 | + Display::display_warning_message(Display::display_warning_message($total_score[1])); |
|
879 | 879 | } |
880 | - $row[] =array ($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true))); |
|
880 | + $row[] = array($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true))); |
|
881 | 881 | } |
882 | 882 | |
883 | 883 | $data[] = $row; |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), |
81 | 81 | array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'), |
82 | 82 | array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false') |
83 | - ); |
|
83 | + ); |
|
84 | 84 | //Autowidth |
85 | 85 | $extra_params['autowidth'] = 'true'; |
86 | 86 | //height auto |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | //With this function we can add actions to the jgrid (edit, delete, etc) |
90 | 90 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
91 | 91 | return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
92 | - ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
93 | - '\'; |
|
92 | + ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
93 | + '\'; |
|
94 | 94 | }'; |
95 | 95 | ?> |
96 | 96 | <script> |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
21 | 21 | |
22 | 22 | // setting breadcrumbs |
23 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
23 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
24 | 24 | |
25 | 25 | $action = isset($_GET['action']) ? $_GET['action'] : null; |
26 | 26 | |
@@ -28,16 +28,16 @@ discard block |
||
28 | 28 | $token = Security::get_token(); |
29 | 29 | |
30 | 30 | if ($action == 'add') { |
31 | - $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel')); |
|
32 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add')); |
|
31 | + $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel')); |
|
32 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add')); |
|
33 | 33 | } elseif ($action == 'edit') { |
34 | - $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel')); |
|
35 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit')); |
|
34 | + $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel')); |
|
35 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit')); |
|
36 | 36 | } else { |
37 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('GradeModel')); |
|
37 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradeModel')); |
|
38 | 38 | } |
39 | 39 | |
40 | -$htmlHeadXtra[]= '<script> |
|
40 | +$htmlHeadXtra[] = '<script> |
|
41 | 41 | |
42 | 42 | function plusItem(item) { |
43 | 43 | if (item != 1) { |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | |
78 | 78 | //Column config |
79 | 79 | $column_model = array( |
80 | - array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), |
|
81 | - array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'), |
|
82 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false') |
|
80 | + array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), |
|
81 | + array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left', 'sortable'=>'false'), |
|
82 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false') |
|
83 | 83 | ); |
84 | 84 | //Autowidth |
85 | 85 | $extra_params['autowidth'] = 'true'; |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | |
89 | 89 | //With this function we can add actions to the jgrid (edit, delete, etc) |
90 | 90 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
91 | - return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
|
92 | - ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
91 | + return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'. |
|
92 | + ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'. |
|
93 | 93 | '\'; |
94 | 94 | }'; |
95 | 95 | ?> |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $(function() { |
98 | 98 | <?php |
99 | 99 | // grid definition see the $obj->display() function |
100 | - echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links,true); |
|
100 | + echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links, true); |
|
101 | 101 | ?> |
102 | 102 | }); |
103 | 103 | </script> |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $obj->display(); |
126 | 126 | } else { |
127 | 127 | echo '<div class="actions">'; |
128 | - echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
128 | + echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
129 | 129 | echo '</div>'; |
130 | 130 | $form->addElement('hidden', 'sec_token'); |
131 | 131 | $form->setConstants(array('sec_token' => $token)); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $obj->display(); |
148 | 148 | } else { |
149 | 149 | echo '<div class="actions">'; |
150 | - echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
150 | + echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
151 | 151 | echo '</div>'; |
152 | 152 | $form->addElement('hidden', 'sec_token'); |
153 | 153 | $form->setConstants(array('sec_token' => $token)); |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Code |
10 | 10 | */ |
11 | 11 | // resetting the course id |
12 | -$cidReset=true; |
|
12 | +$cidReset = true; |
|
13 | 13 | require_once('../inc/global.inc.php'); |
14 | 14 | // setting the section (for the tabs) |
15 | 15 | $this_section = SECTION_PLATFORM_ADMIN; |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | api_protect_admin_script(); |
19 | 19 | require('../auth/ldap/authldap.php'); |
20 | 20 | |
21 | -$annee_base=date('Y'); |
|
21 | +$annee_base = date('Y'); |
|
22 | 22 | |
23 | 23 | $tool_name = get_lang('LDAPImport'); |
24 | 24 | // setting breadcrumbs |
25 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
25 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
26 | 26 | |
27 | 27 | $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript"> |
28 | 28 | var buttoncheck = 1; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | $annee = $_GET['annee']; |
50 | 50 | $composante = $_GET['composante']; |
51 | -$etape = $_GET['etape']; |
|
51 | +$etape = $_GET['etape']; |
|
52 | 52 | $course = $_POST['course']; |
53 | 53 | |
54 | 54 | |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | echo '</div>'; |
199 | 199 | } |
200 | 200 | */ |
201 | -elseif(!empty($annee) && empty($course)) |
|
201 | +elseif (!empty($annee) && empty($course)) |
|
202 | 202 | { |
203 | 203 | Display::display_header($tool_name); |
204 | 204 | echo '<div style="align:center">'; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />'; |
207 | 207 | echo '<select name="course">'; |
208 | 208 | $courses = CourseManager::get_courses_list(); |
209 | - foreach($courses as $row) |
|
209 | + foreach ($courses as $row) |
|
210 | 210 | { |
211 | 211 | echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>'; |
212 | 212 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | $info = ldap_get_entries($ds, $sr); |
241 | 241 | |
242 | - for ($key = 0; $key < $info["count"]; $key ++) { |
|
242 | + for ($key = 0; $key < $info["count"]; $key++) { |
|
243 | 243 | $nom_form[] = $info[$key]["sn"][0]; |
244 | 244 | $prenom_form[] = $info[$key]["givenname"][0]; |
245 | 245 | $email_form[] = $info[$key]["mail"][0]; |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | asort($nom_form); |
260 | 260 | reset($nom_form); |
261 | 261 | |
262 | - $statut=5; |
|
262 | + $statut = 5; |
|
263 | 263 | include ('ldap_form_add_users_group.php'); |
264 | 264 | } else { |
265 | 265 | echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>'; |
@@ -270,25 +270,25 @@ discard block |
||
270 | 270 | echo '</div>'; |
271 | 271 | |
272 | 272 | } |
273 | -elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
|
273 | +elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes')) |
|
274 | 274 | { |
275 | - $id=$_POST['username_form']; |
|
276 | - $UserList=array(); |
|
275 | + $id = $_POST['username_form']; |
|
276 | + $UserList = array(); |
|
277 | 277 | $userid_match_login = array(); |
278 | 278 | foreach ($id as $form_index=>$user_id) |
279 | 279 | { |
280 | - if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes']))) |
|
280 | + if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes']))) |
|
281 | 281 | { |
282 | 282 | $tmp = ldap_add_user($user_id); |
283 | - $UserList[]= $tmp; |
|
283 | + $UserList[] = $tmp; |
|
284 | 284 | $userid_match_login[$tmp] = $user_id; |
285 | 285 | } |
286 | 286 | } |
287 | 287 | if (!empty($_POST['course'])) |
288 | 288 | { |
289 | - foreach($UserList as $user_id) |
|
289 | + foreach ($UserList as $user_id) |
|
290 | 290 | { |
291 | - CourseManager::add_user_to_course($user_id,$_POST['course']); |
|
291 | + CourseManager::add_user_to_course($user_id, $_POST['course']); |
|
292 | 292 | } |
293 | 293 | header('Location: course_information.php?code='.Security::remove_XSS($_POST['course'])); |
294 | 294 | } |
@@ -314,8 +314,8 @@ discard block |
||
314 | 314 | else |
315 | 315 | { |
316 | 316 | Display::display_header($tool_name); |
317 | - $message=get_lang('NoUserAdded'); |
|
318 | - Display :: display_normal_message($message,false); |
|
317 | + $message = get_lang('NoUserAdded'); |
|
318 | + Display :: display_normal_message($message, false); |
|
319 | 319 | } |
320 | 320 | echo '<br /><br />'; |
321 | 321 | echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>'; |
@@ -269,8 +269,7 @@ |
||
269 | 269 | echo '<br /><br />'; |
270 | 270 | echo '</div>'; |
271 | 271 | |
272 | -} |
|
273 | -elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
|
272 | +} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
|
274 | 273 | { |
275 | 274 | $id=$_POST['username_form']; |
276 | 275 | $UserList=array(); |
@@ -56,19 +56,19 @@ discard block |
||
56 | 56 | //if ($annee == "" && $composante == "" && $etape == "") { |
57 | 57 | if (empty($annee) && empty($course)) |
58 | 58 | { |
59 | - Display::display_header($tool_name); |
|
60 | - echo '<div style="align:center">'; |
|
61 | - Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')); |
|
62 | - echo get_lang('LDAPSelectFilterOnUsersOU'); |
|
63 | - //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />'; |
|
64 | - ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />'; |
|
65 | - |
|
66 | - echo '<form method="get" action="'.api_get_self().'"><br />'; |
|
67 | - echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> '; |
|
68 | - echo '<input type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />'; |
|
69 | - echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
70 | - echo '</form>'; |
|
71 | - echo '</div>'; |
|
59 | + Display::display_header($tool_name); |
|
60 | + echo '<div style="align:center">'; |
|
61 | + Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')); |
|
62 | + echo get_lang('LDAPSelectFilterOnUsersOU'); |
|
63 | + //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />'; |
|
64 | + ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />'; |
|
65 | + |
|
66 | + echo '<form method="get" action="'.api_get_self().'"><br />'; |
|
67 | + echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> '; |
|
68 | + echo '<input type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />'; |
|
69 | + echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
70 | + echo '</form>'; |
|
71 | + echo '</div>'; |
|
72 | 72 | |
73 | 73 | } |
74 | 74 | /* |
@@ -200,71 +200,71 @@ discard block |
||
200 | 200 | */ |
201 | 201 | elseif(!empty($annee) && empty($course)) |
202 | 202 | { |
203 | - Display::display_header($tool_name); |
|
204 | - echo '<div style="align:center">'; |
|
205 | - echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />'; |
|
206 | - echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />'; |
|
207 | - echo '<select name="course">'; |
|
208 | - $courses = CourseManager::get_courses_list(); |
|
209 | - foreach($courses as $row) |
|
210 | - { |
|
211 | - echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>'; |
|
212 | - } |
|
213 | - echo '</select>'; |
|
214 | - echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
215 | - echo '</form>'; |
|
216 | - echo '</div>'; |
|
203 | + Display::display_header($tool_name); |
|
204 | + echo '<div style="align:center">'; |
|
205 | + echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />'; |
|
206 | + echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />'; |
|
207 | + echo '<select name="course">'; |
|
208 | + $courses = CourseManager::get_courses_list(); |
|
209 | + foreach($courses as $row) |
|
210 | + { |
|
211 | + echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>'; |
|
212 | + } |
|
213 | + echo '</select>'; |
|
214 | + echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
215 | + echo '</form>'; |
|
216 | + echo '</div>'; |
|
217 | 217 | } |
218 | 218 | // form4 annee != 0; composante != 0 etape != 0 |
219 | 219 | //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') { |
220 | 220 | elseif (!empty($annee) && !empty($course) && empty($_POST['confirmed'])) |
221 | 221 | { |
222 | - Display::display_header($tool_name); |
|
223 | - echo '<div style="align: center;">'; |
|
224 | - echo '<br />'; |
|
225 | - echo '<br />'; |
|
226 | - echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>'; |
|
227 | - //echo "Connection ..."; |
|
228 | - $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError')); |
|
229 | - ldap_set_version($ds); |
|
230 | - |
|
231 | - if ($ds) { |
|
232 | - |
|
233 | - $r = false; |
|
234 | - $res = ldap_handle_bind($ds, $r); |
|
235 | - |
|
236 | - //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))"); |
|
237 | - //echo "(ou=*$annee,ou=$composante)"; |
|
238 | - $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)"); |
|
239 | - |
|
240 | - $info = ldap_get_entries($ds, $sr); |
|
241 | - |
|
242 | - for ($key = 0; $key < $info["count"]; $key ++) { |
|
243 | - $nom_form[] = $info[$key]["sn"][0]; |
|
244 | - $prenom_form[] = $info[$key]["givenname"][0]; |
|
245 | - $email_form[] = $info[$key]["mail"][0]; |
|
246 | - // Get uid from dn |
|
247 | - //$dn_array=ldap_explode_dn($info[$key]["dn"],1); |
|
248 | - //$username_form[] = $dn_array[0]; // uid is first key |
|
249 | - $username_form[] = $info[$key]['uid'][0]; |
|
250 | - $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student" |
|
251 | - //$val = ldap_get_values_len($ds, $entry, "userPassword"); |
|
252 | - //$password_form[] = $val[0]; |
|
253 | - $password_form[] = $info[$key]['userPassword'][0]; |
|
254 | - } |
|
255 | - ldap_unbind($ds); |
|
256 | - |
|
257 | - /*-----------------------------------------------*/ |
|
258 | - |
|
259 | - asort($nom_form); |
|
260 | - reset($nom_form); |
|
261 | - |
|
262 | - $statut=5; |
|
263 | - include ('ldap_form_add_users_group.php'); |
|
264 | - } else { |
|
265 | - echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>'; |
|
266 | - } |
|
267 | - echo '<br /><br />'; |
|
222 | + Display::display_header($tool_name); |
|
223 | + echo '<div style="align: center;">'; |
|
224 | + echo '<br />'; |
|
225 | + echo '<br />'; |
|
226 | + echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>'; |
|
227 | + //echo "Connection ..."; |
|
228 | + $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError')); |
|
229 | + ldap_set_version($ds); |
|
230 | + |
|
231 | + if ($ds) { |
|
232 | + |
|
233 | + $r = false; |
|
234 | + $res = ldap_handle_bind($ds, $r); |
|
235 | + |
|
236 | + //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))"); |
|
237 | + //echo "(ou=*$annee,ou=$composante)"; |
|
238 | + $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)"); |
|
239 | + |
|
240 | + $info = ldap_get_entries($ds, $sr); |
|
241 | + |
|
242 | + for ($key = 0; $key < $info["count"]; $key ++) { |
|
243 | + $nom_form[] = $info[$key]["sn"][0]; |
|
244 | + $prenom_form[] = $info[$key]["givenname"][0]; |
|
245 | + $email_form[] = $info[$key]["mail"][0]; |
|
246 | + // Get uid from dn |
|
247 | + //$dn_array=ldap_explode_dn($info[$key]["dn"],1); |
|
248 | + //$username_form[] = $dn_array[0]; // uid is first key |
|
249 | + $username_form[] = $info[$key]['uid'][0]; |
|
250 | + $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student" |
|
251 | + //$val = ldap_get_values_len($ds, $entry, "userPassword"); |
|
252 | + //$password_form[] = $val[0]; |
|
253 | + $password_form[] = $info[$key]['userPassword'][0]; |
|
254 | + } |
|
255 | + ldap_unbind($ds); |
|
256 | + |
|
257 | + /*-----------------------------------------------*/ |
|
258 | + |
|
259 | + asort($nom_form); |
|
260 | + reset($nom_form); |
|
261 | + |
|
262 | + $statut=5; |
|
263 | + include ('ldap_form_add_users_group.php'); |
|
264 | + } else { |
|
265 | + echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>'; |
|
266 | + } |
|
267 | + echo '<br /><br />'; |
|
268 | 268 | echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>'; |
269 | 269 | echo '<br /><br />'; |
270 | 270 | echo '</div>'; |
@@ -272,27 +272,27 @@ discard block |
||
272 | 272 | } |
273 | 273 | elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
274 | 274 | { |
275 | - $id=$_POST['username_form']; |
|
276 | - $UserList=array(); |
|
277 | - $userid_match_login = array(); |
|
278 | - foreach ($id as $form_index=>$user_id) |
|
279 | - { |
|
280 | - if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes']))) |
|
281 | - { |
|
282 | - $tmp = ldap_add_user($user_id); |
|
283 | - $UserList[]= $tmp; |
|
284 | - $userid_match_login[$tmp] = $user_id; |
|
285 | - } |
|
286 | - } |
|
287 | - if (!empty($_POST['course'])) |
|
288 | - { |
|
289 | - foreach($UserList as $user_id) |
|
290 | - { |
|
291 | - CourseManager::add_user_to_course($user_id,$_POST['course']); |
|
292 | - } |
|
293 | - header('Location: course_information.php?code='.Security::remove_XSS($_POST['course'])); |
|
294 | - } |
|
295 | - /* |
|
275 | + $id=$_POST['username_form']; |
|
276 | + $UserList=array(); |
|
277 | + $userid_match_login = array(); |
|
278 | + foreach ($id as $form_index=>$user_id) |
|
279 | + { |
|
280 | + if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes']))) |
|
281 | + { |
|
282 | + $tmp = ldap_add_user($user_id); |
|
283 | + $UserList[]= $tmp; |
|
284 | + $userid_match_login[$tmp] = $user_id; |
|
285 | + } |
|
286 | + } |
|
287 | + if (!empty($_POST['course'])) |
|
288 | + { |
|
289 | + foreach($UserList as $user_id) |
|
290 | + { |
|
291 | + CourseManager::add_user_to_course($user_id,$_POST['course']); |
|
292 | + } |
|
293 | + header('Location: course_information.php?code='.Security::remove_XSS($_POST['course'])); |
|
294 | + } |
|
295 | + /* |
|
296 | 296 | else |
297 | 297 | { |
298 | 298 | Display :: display_header($tool_name); |
@@ -311,13 +311,13 @@ discard block |
||
311 | 311 | Display :: display_normal_message($message,false); |
312 | 312 | } |
313 | 313 | */ |
314 | - else |
|
315 | - { |
|
316 | - Display::display_header($tool_name); |
|
317 | - $message=get_lang('NoUserAdded'); |
|
318 | - Display :: display_normal_message($message,false); |
|
319 | - } |
|
320 | - echo '<br /><br />'; |
|
314 | + else |
|
315 | + { |
|
316 | + Display::display_header($tool_name); |
|
317 | + $message=get_lang('NoUserAdded'); |
|
318 | + Display :: display_normal_message($message,false); |
|
319 | + } |
|
320 | + echo '<br /><br />'; |
|
321 | 321 | echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>'; |
322 | 322 | echo '<br /><br />'; |
323 | 323 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | <?php |
88 | 88 | echo Display::get_alphabet_options($firstLetterUserGroup); |
89 | 89 | echo Display::get_numeric_options(0, 9, $firstLetterUserGroup); |
90 | - ?> |
|
90 | + ?> |
|
91 | 91 | </select> |
92 | 92 | </td> |
93 | 93 | <td width="20%"> </td> |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE); |
31 | 31 | |
32 | 32 | $tool_name = get_lang('AddUserGroupToURL'); |
33 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
34 | -$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
|
33 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
34 | +$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
|
35 | 35 | |
36 | 36 | Display::display_header($tool_name); |
37 | 37 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | |
47 | 47 | if (isset($_POST['form_sent']) && $_POST['form_sent']) { |
48 | 48 | $form_sent = $_POST['form_sent']; |
49 | - $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ; |
|
50 | - $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ; |
|
49 | + $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array(); |
|
50 | + $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array(); |
|
51 | 51 | $firstLetterUserGroup = $_POST['first_letter_user_group']; |
52 | 52 | |
53 | 53 | if ($form_sent == 1) { |
@@ -99,7 +99,10 @@ discard block |
||
99 | 99 | <td width="40%" align="center"> |
100 | 100 | <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;"> |
101 | 101 | <?php foreach ($dbUserGroups as $item) { ?> |
102 | - <option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?> |
|
102 | + <option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) { |
|
103 | + echo 'selected="selected"'; |
|
104 | +} |
|
105 | +?>><?php echo $item['name']; ?> |
|
103 | 106 | </option> |
104 | 107 | <?php } ?> |
105 | 108 | </select> |
@@ -110,7 +113,10 @@ discard block |
||
110 | 113 | <td width="40%" align="center"> |
111 | 114 | <select name="url_list[]" multiple="multiple" size="20" style="width:300px;"> |
112 | 115 | <?php foreach ($db_urls as $url_obj) { ?> |
113 | - <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?> |
|
116 | + <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) { |
|
117 | + echo 'selected="selected"'; |
|
118 | +} |
|
119 | +?>><?php echo $url_obj['url']; ?> |
|
114 | 120 | </option> |
115 | 121 | <?php } ?> |
116 | 122 | </select> |
@@ -114,7 +114,7 @@ |
||
114 | 114 | $from = intval($from); |
115 | 115 | $number_of_items = intval($number_of_items); |
116 | 116 | $column = intval($column); |
117 | - $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction; |
|
117 | + $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction; |
|
118 | 118 | |
119 | 119 | $sql = "SELECT |
120 | 120 | id AS col0, |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | |
68 | 68 | //Column config |
69 | 69 | $column_model = array( |
70 | - array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'), |
|
70 | + array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'), |
|
71 | 71 | // array('name'=>'message', 'index'=>'message', 'width'=>'500', 'align'=>'left','sortable'=>'false'), |
72 | - array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'), |
|
73 | - array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'), |
|
74 | - array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'), |
|
75 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'100') |
|
72 | + array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'), |
|
73 | + array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'), |
|
74 | + array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'), |
|
75 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'100') |
|
76 | 76 | ); |
77 | 77 | //Autowidth |
78 | 78 | $extra_params['autowidth'] = 'true'; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
83 | 83 | $htmlHeadXtra[] = '<script> |
84 | 84 | $(function() { |
85 | - '.Display::grid_js('event_email_template', $url,$columns,$column_model,$extra_params, array(), $action_links,true).' |
|
85 | + '.Display::grid_js('event_email_template', $url, $columns, $column_model, $extra_params, array(), $action_links, true).' |
|
86 | 86 | }); |
87 | 87 | </script>'; |
88 | 88 |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | public function deleteAction($id) { |
34 | - $event_email_template = new EventEmailTemplate(); |
|
34 | + $event_email_template = new EventEmailTemplate(); |
|
35 | 35 | return $event_email_template->delete($id); |
36 | 36 | } |
37 | 37 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'), |
74 | 74 | array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'), |
75 | 75 | array('name'=>'actions', 'index'=>'actions', 'width'=>'100') |
76 | - ); |
|
76 | + ); |
|
77 | 77 | //Autowidth |
78 | 78 | $extra_params['autowidth'] = 'true'; |
79 | 79 | //height auto |