@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | |
14 | 14 | $hotspot_lang_file = api_get_path(SYS_LANG_PATH); |
15 | 15 | |
16 | -if(isset($_GET['lang'])) { |
|
16 | +if (isset($_GET['lang'])) { |
|
17 | 17 | //$search = array('../','\\0','\\'); |
18 | 18 | $lang = urldecode($_GET['lang']); |
19 | 19 | if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
20 | 20 | //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
21 | - if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
22 | - $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
21 | + if (file_exists($hotspot_lang_file.$lang.'/hotspot.inc.php')) |
|
22 | + $hotspot_lang_file .= $lang.'/hotspot.inc.php'; |
|
23 | 23 | else |
24 | 24 | $hotspot_lang_file .= 'english/hotspot.inc.php'; |
25 | 25 | } else { |
@@ -33,25 +33,25 @@ discard block |
||
33 | 33 | |
34 | 34 | $temp = array(); |
35 | 35 | |
36 | -foreach($file as $value) |
|
36 | +foreach ($file as $value) |
|
37 | 37 | { |
38 | 38 | $explode = explode('=', $value); |
39 | 39 | |
40 | - if(count($explode) > 1) |
|
40 | + if (count($explode) > 1) |
|
41 | 41 | { |
42 | 42 | $explode[0] = trim($explode[0]); |
43 | - $explode[0] = '&' . substr($explode[0], 1, strlen($explode[0])); |
|
43 | + $explode[0] = '&'.substr($explode[0], 1, strlen($explode[0])); |
|
44 | 44 | |
45 | 45 | $explode[1] = trim($explode[1]); |
46 | 46 | $explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1); |
47 | 47 | $explode[1] = str_replace('"', '', $explode[1]); |
48 | 48 | |
49 | - $temp[] = $explode[0] . '=' . $explode[1]; |
|
49 | + $temp[] = $explode[0].'='.$explode[1]; |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | -foreach($temp as $value) |
|
53 | +foreach ($temp as $value) |
|
54 | 54 | { |
55 | - echo $value . ' '; |
|
55 | + echo $value.' '; |
|
56 | 56 | } |
57 | 57 | ?> |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | $data[$question_id]['type'] = $question_obj->get_question_type_name(); |
62 | 62 | $percentange = 0; |
63 | 63 | if ($count_students) { |
64 | - $percentange = $count_users / $count_students*100; |
|
64 | + $percentange = $count_users / $count_students * 100; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $data[$question_id]['students_who_try_exercise'] = Display::bar_progress( |
68 | 68 | $percentange, |
69 | 69 | false, |
70 | - $count_users .' / '.$count_students |
|
70 | + $count_users.' / '.$count_students |
|
71 | 71 | ); |
72 | 72 | $data[$question_id]['lowest_score'] = round($exercise_stats['min'], 2); |
73 | 73 | $data[$question_id]['average_score'] = round($exercise_stats['average'], 2); |
@@ -142,23 +142,23 @@ discard block |
||
142 | 142 | } else { |
143 | 143 | $data[$id]['name'] = '-'; |
144 | 144 | } |
145 | - $data[$id]['answer'] = $answer_item; |
|
145 | + $data[$id]['answer'] = $answer_item; |
|
146 | 146 | |
147 | 147 | $answer_item = api_substr($answer_item, 1); |
148 | - $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) -1); |
|
148 | + $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) - 1); |
|
149 | 149 | |
150 | - $data[$id]['answer'] = $answer_item; |
|
150 | + $data[$id]['answer'] = $answer_item; |
|
151 | 151 | |
152 | - $data[$id]['correct'] = '-'; |
|
152 | + $data[$id]['correct'] = '-'; |
|
153 | 153 | |
154 | 154 | $count = ExerciseLib::getNumberStudentsFillBlanksAnwserCount($question_id, $exercise_id); |
155 | 155 | $count = $count[$counter]; |
156 | 156 | |
157 | 157 | $percentange = 0; |
158 | 158 | if (!empty($count_students)) { |
159 | - $percentange = $count/$count_students*100; |
|
159 | + $percentange = $count / $count_students * 100; |
|
160 | 160 | } |
161 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
161 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
162 | 162 | $id++; |
163 | 163 | $counter++; |
164 | 164 | } |
@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | ); |
195 | 195 | $percentange = 0; |
196 | 196 | if (!empty($count_students)) { |
197 | - $percentange = $count/$count_students*100; |
|
197 | + $percentange = $count / $count_students * 100; |
|
198 | 198 | } |
199 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
199 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
200 | 200 | } |
201 | 201 | break; |
202 | 202 | case HOT_SPOT: |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | ); |
218 | 218 | $percentange = 0; |
219 | 219 | if (!empty($count_students)) { |
220 | - $percentange = $count/$count_students*100; |
|
220 | + $percentange = $count / $count_students * 100; |
|
221 | 221 | } |
222 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
222 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
223 | 223 | break; |
224 | 224 | default: |
225 | 225 | if ($answer_id == 1) { |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | ); |
240 | 240 | $percentange = 0; |
241 | 241 | if (!empty($count_students)) { |
242 | - $percentange = $count/$count_students*100; |
|
242 | + $percentange = $count / $count_students * 100; |
|
243 | 243 | } |
244 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
244 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
245 | 245 | } |
246 | 246 | $id++; |
247 | 247 | } |
@@ -273,8 +273,8 @@ discard block |
||
273 | 273 | $interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name); |
274 | 274 | |
275 | 275 | $tpl = new Template(get_lang('ReportByQuestion')); |
276 | -$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' . |
|
277 | - Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
276 | +$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'. |
|
277 | + Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
278 | 278 | $actions = Display::div($actions, array('class'=> 'actions')); |
279 | 279 | $content = $actions.$content; |
280 | 280 | $tpl->assign('content', $content); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | // the breadcrumbs |
24 | -$interbreadcrumb[]= array ( |
|
24 | +$interbreadcrumb[] = array( |
|
25 | 25 | "url" => api_get_path(WEB_CODE_PATH)."exercice/exercise.php?".api_get_cidreq(), |
26 | 26 | "name" => get_lang('Exercises') |
27 | 27 | ); |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | $html = '<table class="table table-striped table-hover">'; |
45 | 45 | $html .= '<thead>'; |
46 | 46 | $html .= '<tr>'; |
47 | - $html .= '<th>' . get_lang('Number') . '</th>'; |
|
48 | - $html .= '<th>' . get_lang('True') . '</th>'; |
|
49 | - $html .= '<th>' . get_lang('False') . '</th>'; |
|
50 | - $html .= '<th>' . get_lang('Answer') . '</th>'; |
|
47 | + $html .= '<th>'.get_lang('Number').'</th>'; |
|
48 | + $html .= '<th>'.get_lang('True').'</th>'; |
|
49 | + $html .= '<th>'.get_lang('False').'</th>'; |
|
50 | + $html .= '<th>'.get_lang('Answer').'</th>'; |
|
51 | 51 | |
52 | 52 | // show column comment when feedback is enable |
53 | 53 | if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { |
54 | - $html .= '<th>' . get_lang('Comment') . '</th>'; |
|
54 | + $html .= '<th>'.get_lang('Comment').'</th>'; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $html .= '</tr>'; |
@@ -89,19 +89,19 @@ discard block |
||
89 | 89 | |
90 | 90 | $renderer->setElementTemplate( |
91 | 91 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
92 | - 'correct[' . $i . ']' |
|
92 | + 'correct['.$i.']' |
|
93 | 93 | ); |
94 | 94 | $renderer->setElementTemplate( |
95 | 95 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
96 | - 'counter[' . $i . ']' |
|
96 | + 'counter['.$i.']' |
|
97 | 97 | ); |
98 | 98 | $renderer->setElementTemplate( |
99 | 99 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
100 | - 'answer[' . $i . ']' |
|
100 | + 'answer['.$i.']' |
|
101 | 101 | ); |
102 | 102 | $renderer->setElementTemplate( |
103 | 103 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
104 | - 'comment[' . $i . ']' |
|
104 | + 'comment['.$i.']' |
|
105 | 105 | ); |
106 | 106 | |
107 | 107 | $answer_number = $form->addElement( |
@@ -114,15 +114,15 @@ discard block |
||
114 | 114 | $answer_number->freeze(); |
115 | 115 | |
116 | 116 | if (is_object($answer)) { |
117 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
118 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
117 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
118 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
119 | 119 | $correct = $answer->correct[$i]; |
120 | - $defaults['correct[' . $i . ']'] = $correct; |
|
120 | + $defaults['correct['.$i.']'] = $correct; |
|
121 | 121 | |
122 | 122 | $j = 1; |
123 | 123 | if (!empty($optionData)) { |
124 | 124 | foreach ($optionData as $id => $data) { |
125 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, $id); |
|
125 | + $form->addElement('radio', 'correct['.$i.']', null, null, $id); |
|
126 | 126 | $j++; |
127 | 127 | if ($j == 3) { |
128 | 128 | break; |
@@ -130,15 +130,15 @@ discard block |
||
130 | 130 | } |
131 | 131 | } |
132 | 132 | } else { |
133 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, 1); |
|
134 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, 2); |
|
133 | + $form->addElement('radio', 'correct['.$i.']', null, null, 1); |
|
134 | + $form->addElement('radio', 'correct['.$i.']', null, null, 2); |
|
135 | 135 | |
136 | - $defaults['answer[' . $i . ']'] = ''; |
|
137 | - $defaults['comment[' . $i . ']'] = ''; |
|
138 | - $defaults['correct[' . $i . ']'] = ''; |
|
136 | + $defaults['answer['.$i.']'] = ''; |
|
137 | + $defaults['comment['.$i.']'] = ''; |
|
138 | + $defaults['correct['.$i.']'] = ''; |
|
139 | 139 | } |
140 | 140 | |
141 | - $boxes_names[] = 'correct[' . $i . ']'; |
|
141 | + $boxes_names[] = 'correct['.$i.']'; |
|
142 | 142 | |
143 | 143 | $form->addHtmlEditor( |
144 | 144 | "answer[$i]", |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { |
153 | 153 | $form->addElement( |
154 | 154 | 'html_editor', |
155 | - 'comment[' . $i . ']', |
|
155 | + 'comment['.$i.']', |
|
156 | 156 | null, |
157 | 157 | array(), |
158 | 158 | array( |
@@ -170,22 +170,22 @@ discard block |
||
170 | 170 | |
171 | 171 | $correctInputTemplate = '<div class="form-group">'; |
172 | 172 | $correctInputTemplate .= '<label class="col-sm-2 control-label">'; |
173 | - $correctInputTemplate .= '<span class="form_required">*</span>' . get_lang('Score'); |
|
173 | + $correctInputTemplate .= '<span class="form_required">*</span>'.get_lang('Score'); |
|
174 | 174 | $correctInputTemplate .= '</label>'; |
175 | 175 | $correctInputTemplate .= '<div class="col-sm-8">'; |
176 | 176 | $correctInputTemplate .= '<table>'; |
177 | 177 | $correctInputTemplate .= '<tr>'; |
178 | 178 | $correctInputTemplate .= '<td>'; |
179 | - $correctInputTemplate .= get_lang('Correct') . '{element}'; |
|
179 | + $correctInputTemplate .= get_lang('Correct').'{element}'; |
|
180 | 180 | $correctInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
181 | 181 | $correctInputTemplate .= '</td>'; |
182 | 182 | |
183 | 183 | $wrongInputTemplate = '<td>'; |
184 | - $wrongInputTemplate .= get_lang('Wrong') . '{element}'; |
|
184 | + $wrongInputTemplate .= get_lang('Wrong').'{element}'; |
|
185 | 185 | $wrongInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
186 | 186 | $wrongInputTemplate .= '</td>'; |
187 | 187 | |
188 | - $doubtScoreInputTemplate = '<td>' . get_lang('DoubtScore') . '<br>{element}'; |
|
188 | + $doubtScoreInputTemplate = '<td>'.get_lang('DoubtScore').'<br>{element}'; |
|
189 | 189 | $doubtScoreInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
190 | 190 | $doubtScoreInputTemplate .= '</td>'; |
191 | 191 | $doubtScoreInputTemplate .= '</tr>'; |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | if (!empty($scores)) { |
216 | 216 | for ($i = 1; $i <= 3; $i++) { |
217 | - $defaults['option[' . $i . ']'] = $scores[$i - 1]; |
|
217 | + $defaults['option['.$i.']'] = $scores[$i - 1]; |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | } |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | Question::updateQuestionOption($id, $optionData, $course_id); |
263 | 263 | } |
264 | 264 | } else { |
265 | - for ($i=1 ; $i <= 3 ; $i++) { |
|
265 | + for ($i = 1; $i <= 3; $i++) { |
|
266 | 266 | $last_id = Question::saveQuestionOption( |
267 | 267 | $this->id, |
268 | 268 | $this->options[$i], |
@@ -287,9 +287,9 @@ discard block |
||
287 | 287 | the true, false, doubt options registered in this format |
288 | 288 | XX:YY:ZZZ where XX is a float score value.*/ |
289 | 289 | $extra_values = array(); |
290 | - for ($i=1 ; $i <= 3 ; $i++) { |
|
290 | + for ($i = 1; $i <= 3; $i++) { |
|
291 | 291 | $score = trim($form -> getSubmitValue('option['.$i.']')); |
292 | - $extra_values[]= $score; |
|
292 | + $extra_values[] = $score; |
|
293 | 293 | } |
294 | 294 | $this->setExtra(implode(':', $extra_values)); |
295 | 295 | |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | $questionWeighting += $extra_values[0]; //By default 0 has the correct answers |
306 | 306 | |
307 | - $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i); |
|
307 | + $objAnswer->createAnswer($answer, $goodAnswer, $comment, '', $i); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | // saves the answers into the data base |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | function return_header($feedback_type = null, $counter = null, $score = null) |
325 | 325 | { |
326 | 326 | $header = parent::return_header($feedback_type, $counter, $score); |
327 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
327 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
328 | 328 | <tr> |
329 | 329 | <th>'.get_lang("Choice").'</th> |
330 | 330 | <th>'. get_lang("ExpectedChoice").'</th> |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER); |
14 | 14 | $questionId = intval($_GET['questionId']); |
15 | -$answerId = intval($_GET['answerId']); |
|
15 | +$answerId = intval($_GET['answerId']); |
|
16 | 16 | |
17 | 17 | if ($_GET['type'] == "square" || $_GET['type'] == "circle") { |
18 | 18 | $hotspot_type = $_GET['type']; |
@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | } |
21 | 21 | if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") { |
22 | 22 | $hotspot_type = $_GET['type']; |
23 | - $tmp_coord = explode(",",$_GET['co']); |
|
23 | + $tmp_coord = explode(",", $_GET['co']); |
|
24 | 24 | $i = 0; |
25 | 25 | $hotspot_coordinates = ""; |
26 | 26 | foreach ($tmp_coord as $coord) { |
27 | - if ($i%2 == 0) { |
|
27 | + if ($i % 2 == 0) { |
|
28 | 28 | $delimiter = ";"; |
29 | 29 | } else { |
30 | 30 | $delimiter = "|"; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $hotspot_coordinates .= $coord.$delimiter; |
33 | 33 | $i++; |
34 | 34 | } |
35 | - $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2); |
|
35 | + $hotspot_coordinates = api_substr($hotspot_coordinates, 0, -2); |
|
36 | 36 | } |
37 | 37 | $course_id = api_get_course_int_id(); |
38 | 38 | $sql = "UPDATE $TBL_ANSWER SET |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | .sortable({ |
109 | 109 | cursor: "move", // works? |
110 | 110 | update: function(event, ui) { |
111 | - var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']);?>"; |
|
111 | + var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']); ?>"; |
|
112 | 112 | $.post("<?php echo $ajax_url ?>", order, function(reponse){ |
113 | 113 | $("#message").html(reponse); |
114 | 114 | }); |
@@ -141,11 +141,11 @@ discard block |
||
141 | 141 | echo "<div class='table-responsive'>"; |
142 | 142 | echo "<table class='table table-condensed'>"; |
143 | 143 | echo "<tr>"; |
144 | - echo "<th style=\"width: 50%;\">" .get_lang('Questions'). "</th>"; |
|
145 | - echo "<th style=\"width: 6%;\">" .get_lang('Type'). "</th>"; |
|
146 | - echo "<th style=\"width: 22%; text-align:center;\">" .get_lang('Category'). "</th>"; |
|
147 | - echo "<th style=\"width: 6%;\">" .get_lang('Difficulty'). "</th>"; |
|
148 | - echo "<th style=\"width: 16%; float:left;\">" .get_lang('Score'). "</th>"; |
|
144 | + echo "<th style=\"width: 50%;\">".get_lang('Questions')."</th>"; |
|
145 | + echo "<th style=\"width: 6%;\">".get_lang('Type')."</th>"; |
|
146 | + echo "<th style=\"width: 22%; text-align:center;\">".get_lang('Category')."</th>"; |
|
147 | + echo "<th style=\"width: 6%;\">".get_lang('Difficulty')."</th>"; |
|
148 | + echo "<th style=\"width: 16%; float:left;\">".get_lang('Score')."</th>"; |
|
149 | 149 | echo "</tr>"; |
150 | 150 | echo "</table>"; |
151 | 151 | echo "</div>"; |
@@ -172,15 +172,14 @@ discard block |
||
172 | 172 | $question_class = get_class($objQuestionTmp); |
173 | 173 | |
174 | 174 | $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'. |
175 | - Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>'; |
|
175 | + Display::return_icon('cd.gif', get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>'; |
|
176 | 176 | $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ? |
177 | 177 | '<a>'.Display::return_icon( |
178 | 178 | 'edit_na.png', |
179 | 179 | get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'), |
180 | 180 | array(), |
181 | 181 | ICON_SIZE_SMALL |
182 | - ).'</a>' : |
|
183 | - '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='. |
|
182 | + ).'</a>' : '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='. |
|
184 | 183 | $objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'. |
185 | 184 | Display::return_icon( |
186 | 185 | 'edit.png', |
@@ -190,16 +189,16 @@ discard block |
||
190 | 189 | ).'</a>'; |
191 | 190 | $delete_link = null; |
192 | 191 | if ($objExercise->edit_exercise_in_lp == true) { |
193 | - $delete_link = '<a id="delete_'.$id.'" class="opener" href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>'; |
|
192 | + $delete_link = '<a id="delete_'.$id.'" class="opener" href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png', get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>'; |
|
194 | 193 | } |
195 | 194 | |
196 | - $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
197 | - $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
195 | + $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
196 | + $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
198 | 197 | $delete_link = Display::tag('div', $delete_link, array('style'=>'float:left; padding:0px; margin:0px')); |
199 | 198 | $actions = Display::tag( |
200 | 199 | 'div', |
201 | 200 | $edit_link.$clone_link.$delete_link, |
202 | - array('class'=>'edition','style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;') |
|
201 | + array('class'=>'edition', 'style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;') |
|
203 | 202 | ); |
204 | 203 | |
205 | 204 | $title = Security::remove_XSS($objQuestionTmp->selectTitle()); |
@@ -248,7 +247,7 @@ discard block |
||
248 | 247 | echo $actions; |
249 | 248 | echo '</div>'; |
250 | 249 | echo '<div class="question-list-description-block">'; |
251 | - echo '<p class="lead">' . get_lang($question_class) . '</p>'; |
|
250 | + echo '<p class="lead">'.get_lang($question_class).'</p>'; |
|
252 | 251 | //echo get_lang('Level').': '.$objQuestionTmp->selectLevel(); |
253 | 252 | ExerciseLib::showQuestion($id, false, null, null, false, true, false, true, $objExercise->feedback_type, true); |
254 | 253 | echo '</div>'; |
@@ -8,21 +8,21 @@ discard block |
||
8 | 8 | require_once '../inc/global.inc.php'; |
9 | 9 | |
10 | 10 | // the section (tabs) |
11 | -$this_section=SECTION_COURSES; |
|
11 | +$this_section = SECTION_COURSES; |
|
12 | 12 | |
13 | 13 | // notice for unauthorized people. |
14 | 14 | api_protect_course_script(true); |
15 | 15 | |
16 | 16 | // breadcrumbs |
17 | -$interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises')); |
|
17 | +$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises')); |
|
18 | 18 | |
19 | 19 | // Tool name |
20 | -$nameTools=get_lang('AddQuestionToExercise'); |
|
20 | +$nameTools = get_lang('AddQuestionToExercise'); |
|
21 | 21 | |
22 | 22 | // The form |
23 | -$form = new FormValidator('add_question','post',api_get_self().'?'.api_get_cidreq()); |
|
23 | +$form = new FormValidator('add_question', 'post', api_get_self().'?'.api_get_cidreq()); |
|
24 | 24 | // form title |
25 | -$form->addElement('header','',get_lang('AddQuestionToExercise')); |
|
25 | +$form->addElement('header', '', get_lang('AddQuestionToExercise')); |
|
26 | 26 | |
27 | 27 | $question_list = Question::get_question_type_list(); |
28 | 28 | $question_list_options = array(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | ); |
39 | 39 | |
40 | 40 | //session id |
41 | -$session_id = api_get_session_id(); |
|
41 | +$session_id = api_get_session_id(); |
|
42 | 42 | |
43 | 43 | // the exercises |
44 | 44 | $tbl_exercises = Database :: get_course_table(TABLE_QUIZ_TEST); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | Display::display_header($nameTools); |
99 | 99 | |
100 | 100 | echo '<div class="actions">'; |
101 | - echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
101 | + echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
102 | 102 | echo '</div>'; |
103 | 103 | |
104 | 104 | // displaying the form |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | ), |
134 | 134 | array('ToolbarSet' => 'TestQuestionDescription', 'Width' => '100%', 'Height' => '350')); |
135 | 135 | |
136 | - $form->addRule('answer', get_lang('GiveText'),'required'); |
|
137 | - $form->addRule('answer', get_lang('DefineBlanks'),'regex','/\[.*\]/'); |
|
136 | + $form->addRule('answer', get_lang('GiveText'), 'required'); |
|
137 | + $form->addRule('answer', get_lang('DefineBlanks'), 'regex', '/\[.*\]/'); |
|
138 | 138 | |
139 | 139 | $form->addElement('label', null, get_lang('IfYouWantOnlyIntegerValuesWriteBothLimitsWithoutDecimals')); |
140 | 140 | $form->addElement('html', '<div id="blanks_weighting"></div>'); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $form->setDefaults(array('weighting' => '10')); |
162 | 162 | |
163 | 163 | $form->addElement('text', 'answerVariations', get_lang('AnswerVariations')); |
164 | - $form->addRule('answerVariations', get_lang('GiveAnswerVariations'),'required'); |
|
164 | + $form->addRule('answerVariations', get_lang('GiveAnswerVariations'), 'required'); |
|
165 | 165 | $form->setDefaults(array('answerVariations' => '1')); |
166 | 166 | |
167 | 167 | global $text; |
@@ -201,22 +201,21 @@ discard block |
||
201 | 201 | $answerVariations = $form->getSubmitValue('answerVariations'); |
202 | 202 | $this->weighting = $form->getSubmitValue('weighting'); |
203 | 203 | // Create as many answers as $answerVariations |
204 | - for ($j=0 ; $j < $answerVariations; $j++) { |
|
204 | + for ($j = 0; $j < $answerVariations; $j++) { |
|
205 | 205 | $auxAnswer = $answer; |
206 | 206 | $auxFormula = $formula; |
207 | 207 | $nb = preg_match_all('/\[[^\]]*\]/', $auxAnswer, $blanks); |
208 | 208 | if ($nb > 0) { |
209 | - for ($i=0 ; $i < $nb; ++$i) { |
|
209 | + for ($i = 0; $i < $nb; ++$i) { |
|
210 | 210 | $blankItem = $blanks[0][$i]; |
211 | 211 | $replace = array("[", "]"); |
212 | 212 | $newBlankItem = str_replace($replace, "", $blankItem); |
213 | 213 | $newBlankItem = "[".trim($newBlankItem)."]"; |
214 | 214 | // take random float values when one or both edge values have a decimal point |
215 | 215 | $randomValue = |
216 | - (strpos($lowestValues[$i],'.') !== false || |
|
217 | - strpos($highestValues[$i],'.') !== false) ? |
|
218 | - mt_rand($lowestValues[$i]*100,$highestValues[$i]*100)/100 : |
|
219 | - mt_rand($lowestValues[$i],$highestValues[$i]); |
|
216 | + (strpos($lowestValues[$i], '.') !== false || |
|
217 | + strpos($highestValues[$i], '.') !== false) ? |
|
218 | + mt_rand($lowestValues[$i] * 100, $highestValues[$i] * 100) / 100 : mt_rand($lowestValues[$i], $highestValues[$i]); |
|
220 | 219 | $auxAnswer = str_replace($blankItem, $randomValue, $auxAnswer); |
221 | 220 | $auxFormula = str_replace($blankItem, $randomValue, $auxFormula); |
222 | 221 | } |
@@ -250,7 +249,7 @@ discard block |
||
250 | 249 | function return_header($feedback_type = null, $counter = null, $score = null) |
251 | 250 | { |
252 | 251 | $header = parent::return_header($feedback_type, $counter, $score); |
253 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
252 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
254 | 253 | <tr> |
255 | 254 | <th>'.get_lang("Answer").'</th> |
256 | 255 | </tr>'; |
@@ -72,12 +72,12 @@ discard block |
||
72 | 72 | for ($i = 1; $i <= $answer->nbrAnswers; $i++) { |
73 | 73 | if ($answer->isCorrect($i)) { |
74 | 74 | $nb_matches++; |
75 | - $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i); |
|
76 | - $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1); |
|
77 | - $defaults['matches[' . $nb_matches . ']'] = $answer->correct[$i]; |
|
75 | + $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i); |
|
76 | + $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1); |
|
77 | + $defaults['matches['.$nb_matches.']'] = $answer->correct[$i]; |
|
78 | 78 | } else { |
79 | 79 | $nb_options++; |
80 | - $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i); |
|
80 | + $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | } |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | $html = '<table class="table table-striped table-hover"> |
109 | 109 | <thead> |
110 | 110 | <tr> |
111 | - <th width="5%">' . get_lang('Number') . '</th> |
|
112 | - <th width="70%">' . get_lang('Answer') . '</th> |
|
113 | - <th width="15%">' . get_lang('MatchesTo') . '</th> |
|
114 | - <th width="10%">' . get_lang('Weighting') . '</th> |
|
111 | + <th width="5%">' . get_lang('Number').'</th> |
|
112 | + <th width="70%">' . get_lang('Answer').'</th> |
|
113 | + <th width="15%">' . get_lang('MatchesTo').'</th> |
|
114 | + <th width="10%">' . get_lang('Weighting').'</th> |
|
115 | 115 | </tr> |
116 | 116 | </thead> |
117 | 117 | <tbody>'; |
@@ -162,8 +162,8 @@ discard block |
||
162 | 162 | $html = '<table class="table table-striped table-hover"> |
163 | 163 | <thead> |
164 | 164 | <tr> |
165 | - <th width="15%">' . get_lang('Number') . '</th> |
|
166 | - <th width="85%">' . get_lang('Answer') . '</th> |
|
165 | + <th width="15%">' . get_lang('Number').'</th> |
|
166 | + <th width="85%">' . get_lang('Answer').'</th> |
|
167 | 167 | </tr> |
168 | 168 | </thead> |
169 | 169 | <tbody>'; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | $form->addHtml('<tr>'); |
187 | 187 | |
188 | - $form->addHtml('<td>' . chr(64 + $i) . '</td>'); |
|
188 | + $form->addHtml('<td>'.chr(64 + $i).'</td>'); |
|
189 | 189 | $form->addText("option[$i]", null); |
190 | 190 | |
191 | 191 | $form->addHtml('</tr>'); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | public function return_header($feedback_type = null, $counter = null, $score = null) |
268 | 268 | { |
269 | 269 | $header = parent::return_header($feedback_type, $counter, $score); |
270 | - $header .= '<table class="'.$this->question_table_class .'">'; |
|
270 | + $header .= '<table class="'.$this->question_table_class.'">'; |
|
271 | 271 | $header .= '<tr> |
272 | 272 | <th>'.get_lang('ElementList').'</th> |
273 | 273 | <th>'.get_lang('CorrespondsTo').'</th> |