@@ -39,7 +39,9 @@ |
||
| 39 | 39 | $res->set_evaluation_id($values['evaluation_id']); |
| 40 | 40 | $res->set_user_id(key($scores)); |
| 41 | 41 | //if no scores are given, don't set the score |
| 42 | - if ((!empty ($row)) || ($row == '0')) $res->set_score($row); |
|
| 42 | + if ((!empty ($row)) || ($row == '0')) { |
|
| 43 | + $res->set_score($row); |
|
| 44 | + } |
|
| 43 | 45 | $res->add(); |
| 44 | 46 | next($scores); |
| 45 | 47 | } |
@@ -674,8 +674,9 @@ |
||
| 674 | 674 | $scoretotal = $cattotal[0]->calc_score(api_get_user_id()); |
| 675 | 675 | $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable')); |
| 676 | 676 | $scoreinfo = get_lang('StatsStudent') . ' :<b> ' . $user['complete_name']. '</b><br />'; |
| 677 | - if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) |
|
| 678 | - $scoreinfo.= '<br />' . get_lang('TotalForThisCategory') . ' : <b>' . $scorecourse_display . '</b>'; |
|
| 677 | + if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) { |
|
| 678 | + $scoreinfo.= '<br />' . get_lang('TotalForThisCategory') . ' : <b>' . $scorecourse_display . '</b>'; |
|
| 679 | + } |
|
| 679 | 680 | $scoreinfo.= '<br />' . get_lang('Total') . ' : <b>' . $scoretotal_display . '</b>'; |
| 680 | 681 | Display :: display_normal_message($scoreinfo, false); |
| 681 | 682 | } |
@@ -256,10 +256,11 @@ |
||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | // Categories. |
| 259 | - if (!empty($data_array)) |
|
| 260 | - foreach ($data_array as $data) { |
|
| 259 | + if (!empty($data_array)) { |
|
| 260 | + foreach ($data_array as $data) { |
|
| 261 | 261 | // list of items inside the gradebook (exercises, lps, forums, etc) |
| 262 | 262 | $row = array(); |
| 263 | + } |
|
| 263 | 264 | /** @var AbstractLink $item */ |
| 264 | 265 | $item = $mainCategory = $data[0]; |
| 265 | 266 | |
@@ -149,8 +149,9 @@ |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | foreach ($customdisplays as $display) { |
| 152 | - if (!in_array($display['display'], $key_list)) |
|
| 153 | - $resource_list[$key][$display['display']] = 0; |
|
| 152 | + if (!in_array($display['display'], $key_list)) { |
|
| 153 | + $resource_list[$key][$display['display']] = 0; |
|
| 154 | + } |
|
| 154 | 155 | } |
| 155 | 156 | $i++; |
| 156 | 157 | } |
@@ -1179,7 +1179,7 @@ |
||
| 1179 | 1179 | cu.status = '.COURSEMANAGER.' |
| 1180 | 1180 | )'; |
| 1181 | 1181 | } |
| 1182 | - }elseif (api_is_platform_admin()) { |
|
| 1182 | + } elseif (api_is_platform_admin()) { |
|
| 1183 | 1183 | if (isset($session_id) && $session_id!=0) { |
| 1184 | 1184 | $sql.=' AND session_id='.intval($session_id); |
| 1185 | 1185 | } else { |
@@ -29,8 +29,9 @@ discard block |
||
| 29 | 29 | public function get_not_created_links() |
| 30 | 30 | { |
| 31 | 31 | return false; |
| 32 | - if (empty($this->course_code)) |
|
| 33 | - die('Error in get_not_created_links() : course code not set'); |
|
| 32 | + if (empty($this->course_code)) { |
|
| 33 | + die('Error in get_not_created_links() : course code not set'); |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | 36 | $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); |
| 36 | 37 | |
@@ -57,8 +58,9 @@ discard block |
||
| 57 | 58 | */ |
| 58 | 59 | public function get_all_links() |
| 59 | 60 | { |
| 60 | - if (empty($this->course_code)) |
|
| 61 | - die('Error in get_not_created_links() : course code not set'); |
|
| 61 | + if (empty($this->course_code)) { |
|
| 62 | + die('Error in get_not_created_links() : course code not set'); |
|
| 63 | + } |
|
| 62 | 64 | |
| 63 | 65 | $session_id = api_get_session_id(); |
| 64 | 66 | if (empty($session_id)) { |
@@ -111,8 +113,9 @@ discard block |
||
| 111 | 113 | lp_id = ".$this->get_ref_id()." AND |
| 112 | 114 | session_id = $session_id "; |
| 113 | 115 | |
| 114 | - if (isset($stud_id)) |
|
| 115 | - $sql .= ' AND user_id = '.intval($stud_id); |
|
| 116 | + if (isset($stud_id)) { |
|
| 117 | + $sql .= ' AND user_id = '.intval($stud_id); |
|
| 118 | + } |
|
| 116 | 119 | |
| 117 | 120 | // order by id, that way the student's first attempt is accessed first |
| 118 | 121 | $sql .= ' ORDER BY view_count DESC'; |
@@ -122,8 +125,9 @@ discard block |
||
| 122 | 125 | if (isset($stud_id)) { |
| 123 | 126 | if ($data = Database::fetch_array($scores)) { |
| 124 | 127 | return array ($data['progress'], 100); |
| 125 | - } else |
|
| 126 | - return null; |
|
| 128 | + } else { |
|
| 129 | + return null; |
|
| 130 | + } |
|
| 127 | 131 | } else { |
| 128 | 132 | // all students -> get average |
| 129 | 133 | $students = array(); // user list, needed to make sure we only |
@@ -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 | } |
@@ -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(); |
@@ -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> |