');
@@ -2173,7 +2173,7 @@ class Exercise
}
$form->addElement('date_time_picker', 'end_time');
- $form->addElement('html','
');
+ $form->addElement('html', '');
$display = 'block';
$form->addElement('checkbox', 'propagate_neg', null, get_lang('PropagateNegativeResults'));
@@ -2182,10 +2182,10 @@ class Exercise
null,
get_lang('SaveTheCorrectAnswersForTheNextAttempt')
);
- $form->addElement('html','';
- echo '| ' . $s_answer_label . ' | ';
- echo '' . $user_answer;
+ echo ' | '.$s_answer_label.' | ';
+ echo ''.$user_answer;
if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
if (isset($real_list[$i_answer_correct_answer]) &&
@@ -4167,7 +4167,7 @@ class Exercise
if ($from_database) {
// getting the user answer
$TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
- $query = "SELECT hotspot_correct, hotspot_coordinate
+ $query = "SELECT hotspot_correct, hotspot_coordinate
FROM $TBL_TRACK_HOTSPOT
WHERE
hotspot_exe_id = '".$exeId."' AND
@@ -4175,20 +4175,20 @@ class Exercise
hotspot_answer_id='1'";
//by default we take 1 because it's a delineation
$resq = Database::query($query);
- $row = Database::fetch_array($resq,'ASSOC');
+ $row = Database::fetch_array($resq, 'ASSOC');
$choice = $row['hotspot_correct'];
$user_answer = $row['hotspot_coordinate'];
// THIS is very important otherwise the poly_compile will throw an error!!
// round-up the coordinates
- $coords = explode('/',$user_answer);
+ $coords = explode('/', $user_answer);
$user_array = '';
foreach ($coords as $coord) {
- list($x,$y) = explode(';',$coord);
+ list($x, $y) = explode(';', $coord);
$user_array .= round($x).';'.round($y).'/';
}
- $user_array = substr($user_array,0,-1);
+ $user_array = substr($user_array, 0, -1);
} else {
if (!empty($studentChoice)) {
$newquestionList[] = $questionId;
@@ -4208,7 +4208,7 @@ class Exercise
break;
case ANNOTATION:
if ($from_database) {
- $sql = "SELECT answer, marks FROM $TBL_TRACK_ATTEMPT
+ $sql = "SELECT answer, marks FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = $exeId AND
question_id= ".$questionId;
@@ -4280,7 +4280,7 @@ class Exercise
$results_disabled,
$showTotalScoreAndUserChoicesInLastAttempt
);
- } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE ) {
+ } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
ExerciseShowFunctions::display_multiple_answer_combination_true_false(
$feedback_type,
$answerType,
@@ -4366,13 +4366,13 @@ class Exercise
$user_answer = $_SESSION['exerciseResultCoordinates'][$questionId];
//round-up the coordinates
- $coords = explode('/',$user_answer);
+ $coords = explode('/', $user_answer);
$user_array = '';
foreach ($coords as $coord) {
- list($x,$y) = explode(';',$coord);
+ list($x, $y) = explode(';', $coord);
$user_array .= round($x).';'.round($y).'/';
}
- $user_array = substr($user_array,0,-1);
+ $user_array = substr($user_array, 0, -1);
if ($next) {
$user_answer = $user_array;
@@ -4397,7 +4397,7 @@ class Exercise
//$overlap = round(polygons_overlap($poly_answer,$poly_user));
// //this is an area in pixels
if ($debug > 0) {
- error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+ error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
}
if ($overlap < 1) {
@@ -4410,19 +4410,19 @@ class Exercise
// that is overlapped by the user's polygon
$final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
if ($debug > 1) {
- error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+ error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
}
// the final missing area is the percentage of the initial polygon
// that is not overlapped by the user's polygon
$final_missing = 100 - $final_overlap;
if ($debug > 1) {
- error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+ error_log(__LINE__.' - Final missing is '.$final_missing, 0);
}
// the final excess area is the percentage of the initial polygon's size
// that is covered by the user's polygon outside of the initial polygon
$final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
if ($debug > 1) {
- error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+ error_log(__LINE__.' - Final excess is '.$final_excess, 0);
}
}
@@ -4438,7 +4438,7 @@ class Exercise
);
$threadhold1 = $threadhold_items[0]; // overlap
$threadhold2 = $threadhold_items[1]; // excess
- $threadhold3 = $threadhold_items[2]; //missing
+ $threadhold3 = $threadhold_items[2]; //missing
// if is delineation
if ($answerId === 1) {
@@ -4461,28 +4461,28 @@ class Exercise
$final_missing <= $threadhold3 &&
$final_excess <= $threadhold2
) {
- $next=1; //go to the oars
- $result_comment=get_lang('Acceptable');
- $final_answer = 1; // do not update with update_exercise_attempt
+ $next = 1; //go to the oars
+ $result_comment = get_lang('Acceptable');
+ $final_answer = 1; // do not update with update_exercise_attempt
} else {
- $next=0;
- $result_comment=get_lang('Unacceptable');
- $comment=$answerDestination=$objAnswerTmp->selectComment(1);
- $answerDestination=$objAnswerTmp->selectDestination(1);
+ $next = 0;
+ $result_comment = get_lang('Unacceptable');
+ $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+ $answerDestination = $objAnswerTmp->selectDestination(1);
//checking the destination parameters parsing the "@@"
- $destination_items= explode('@@', $answerDestination);
+ $destination_items = explode('@@', $answerDestination);
}
- } elseif($answerId>1) {
+ } elseif ($answerId > 1) {
if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
- if ($debug>0) {
- error_log(__LINE__.' - answerId is of type noerror',0);
+ if ($debug > 0) {
+ error_log(__LINE__.' - answerId is of type noerror', 0);
}
//type no error shouldn't be treated
$next = 1;
continue;
}
- if ($debug>0) {
- error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);
+ if ($debug > 0) {
+ error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
}
//check the intersection between the oar and the user
//echo 'user'; print_r($x_user_list); print_r($y_user_list);
@@ -4490,26 +4490,26 @@ class Exercise
//$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
$inter = $result['success'];
$delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId);
- $poly_answer = convert_coordinates($delineation_cord,'|');
- $max_coord = poly_get_max($poly_user,$poly_answer);
- $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
- $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+ $poly_answer = convert_coordinates($delineation_cord, '|');
+ $max_coord = poly_get_max($poly_user, $poly_answer);
+ $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+ $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
if ($overlap == false) {
//all good, no overlap
$next = 1;
continue;
} else {
- if ($debug>0) {
- error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);
+ if ($debug > 0) {
+ error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
}
$organs_at_risk_hit++;
//show the feedback
$next = 0;
- $comment = $answerDestination=$objAnswerTmp->selectComment($answerId);
- $answerDestination=$objAnswerTmp->selectDestination($answerId);
+ $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+ $answerDestination = $objAnswerTmp->selectDestination($answerId);
- $destination_items= explode('@@', $answerDestination);
+ $destination_items = explode('@@', $answerDestination);
$try_hotspot = $destination_items[1];
$lp_hotspot = $destination_items[2];
$select_question_hotspot = $destination_items[3];
@@ -4517,8 +4517,8 @@ class Exercise
}
}
} else { // the first delineation feedback
- if ($debug>0) {
- error_log(__LINE__.' first',0);
+ if ($debug > 0) {
+ error_log(__LINE__.' first', 0);
}
}
} elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
@@ -4526,7 +4526,7 @@ class Exercise
echo Display::tag('td', $answerMatching[$answerId]);
echo Display::tag(
'td',
- "$user_answer / " . Display::tag(
+ "$user_answer / ".Display::tag(
'strong',
$answerMatching[$answerCorrect],
['style' => 'color: #008000; font-weight: bold;']
@@ -4693,7 +4693,7 @@ class Exercise
$questionId,
$objQuestionTmp->getFileUrl(),
$results_disabled
- ) . ' |
+ ).'
';
break;
@@ -4751,7 +4751,7 @@ class Exercise
$missing = $poly_results['s1Only'];
$excess = $poly_results['s2Only'];
if ($debug > 0) {
- error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+ error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
}
if ($overlap < 1) {
//shortcut to avoid complicated calculations
@@ -4762,17 +4762,17 @@ class Exercise
// the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
$final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
if ($debug > 1) {
- error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+ error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
}
// the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
$final_missing = 100 - $final_overlap;
if ($debug > 1) {
- error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+ error_log(__LINE__.' - Final missing is '.$final_missing, 0);
}
// the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
$final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
if ($debug > 1) {
- error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+ error_log(__LINE__.' - Final excess is '.$final_excess, 0);
}
}
@@ -4782,7 +4782,7 @@ class Exercise
$threadhold_items = explode(';', $threadhold_total);
$threadhold1 = $threadhold_items[0]; // overlap
$threadhold2 = $threadhold_items[1]; // excess
- $threadhold3 = $threadhold_items[2]; //missing
+ $threadhold3 = $threadhold_items[2]; //missing
// if is delineation
if ($answerId === 1) {
//setting colors
@@ -4817,14 +4817,14 @@ class Exercise
} elseif ($answerId > 1) {
if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
if ($debug > 0) {
- error_log(__LINE__ . ' - answerId is of type noerror', 0);
+ error_log(__LINE__.' - answerId is of type noerror', 0);
}
//type no error shouldn't be treated
$next = 1;
continue;
}
if ($debug > 0) {
- error_log(__LINE__ . ' - answerId is >1 so we\'re probably in OAR', 0);
+ error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
}
//check the intersection between the oar and the user
//echo 'user'; print_r($x_user_list); print_r($y_user_list);
@@ -4838,7 +4838,7 @@ class Exercise
$poly_answer = convert_coordinates($delineation_cord, '|');
$max_coord = poly_get_max($poly_user, $poly_answer);
$poly_answer_compiled = poly_compile($poly_answer, $max_coord);
- $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+ $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
if ($overlap == false) {
//all good, no overlap
@@ -4846,7 +4846,7 @@ class Exercise
continue;
} else {
if ($debug > 0) {
- error_log(__LINE__ . ' - Overlap is ' . $overlap . ': OAR hit', 0);
+ error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
}
$organs_at_risk_hit++;
//show the feedback
@@ -4858,12 +4858,12 @@ class Exercise
$try_hotspot = $destination_items[1];
$lp_hotspot = $destination_items[2];
$select_question_hotspot = $destination_items[3];
- $url_hotspot=$destination_items[4];
+ $url_hotspot = $destination_items[4];
}
}
} else { // the first delineation feedback
if ($debug > 0) {
- error_log(__LINE__ . ' first', 0);
+ error_log(__LINE__.' first', 0);
}
}
break;
@@ -4885,7 +4885,7 @@ class Exercise
echo Display::tag('td', $answerMatching[$answerId]);
echo Display::tag(
'td',
- "$user_answer / " . Display::tag(
+ "$user_answer / ".Display::tag(
'strong',
$answerMatching[$answerCorrect],
['style' => 'color: #008000; font-weight: bold;']
@@ -4980,26 +4980,26 @@ class Exercise
// we use the results from the session (from_db=0)
// TODO Change this, because it is wrong to show the user
// some results that haven't been stored in the database yet
- if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
+ if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) {
if ($debug) error_log('$from AND this is a hotspot kind of question ');
$my_exe_id = 0;
$from_database = 0;
if ($answerType == HOT_SPOT_DELINEATION) {
if (0) {
if ($overlap_color) {
- $overlap_color='green';
+ $overlap_color = 'green';
} else {
- $overlap_color='red';
+ $overlap_color = 'red';
}
if ($missing_color) {
- $missing_color='green';
+ $missing_color = 'green';
} else {
- $missing_color='red';
+ $missing_color = 'red';
}
if ($excess_color) {
- $excess_color='green';
+ $excess_color = 'green';
} else {
- $excess_color='red';
+ $excess_color = 'red';
}
if (!is_numeric($final_overlap)) {
$final_overlap = 0;
@@ -5011,33 +5011,33 @@ class Exercise
$final_excess = 0;
}
- if ($final_overlap>100) {
+ if ($final_overlap > 100) {
$final_overlap = 100;
}
- $table_resume='