Minor - format code

pull/2458/head
jmontoyaa 8 years ago
parent 6e619d2835
commit 15a5101618
  1. 2
      main/exercise/admin.php
  2. 19
      main/exercise/answer.class.php
  3. 3
      main/exercise/calculated_answer.class.php

@ -279,7 +279,7 @@ if (api_is_in_gradebook()) {
];
}
$interbreadcrumb[] = ["url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises')];
$interbreadcrumb[] = ["url" => "exercise.php?".api_get_cidreq(), 'name' => get_lang('Exercises')];
if (isset($_GET['newQuestion']) || isset($_GET['editQuestion'])) {
$interbreadcrumb[] = [
"url" => "admin.php?exerciseId=".$objExercise->id.'&'.api_get_cidreq(),

@ -114,10 +114,10 @@ class Answer
*/
public function read()
{
$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
$table = Database::get_course_table(TABLE_QUIZ_ANSWER);
$questionId = $this->questionId;
$sql = "SELECT * FROM $TBL_ANSWER
$sql = "SELECT * FROM $table
WHERE
c_id = {$this->course_id} AND
question_id ='".$questionId."'
@ -174,11 +174,11 @@ class Answer
*/
public function selectAnswerId()
{
$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
$table = Database::get_course_table(TABLE_QUIZ_ANSWER);
$questionId = $this->questionId;
$sql = "SELECT id FROM
$TBL_ANSWER
$table
WHERE c_id = {$this->course_id} AND question_id ='".$questionId."'";
$result = Database::query($sql);
@ -349,10 +349,9 @@ class Answer
*/
public function selectAnswerByAutoId($auto_id)
{
$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
$table = Database::get_course_table(TABLE_QUIZ_ANSWER);
$auto_id = intval($auto_id);
$sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
$sql = "SELECT id, answer, id_auto FROM $table
WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
$rs = Database::query($sql);
@ -451,8 +450,8 @@ class Answer
*/
public function getQuestionType()
{
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT type FROM $TBL_QUESTIONS
$table = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT type FROM $table
WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
$res = Database::query($sql);
if (Database::num_rows($res) <= 0) {
@ -865,7 +864,7 @@ class Answer
$allAnswers[$this->id[$i]] = $this->answer[$i];
}
foreach ($temp as $index => $answer) {
foreach ($temp as $answer) {
if ($this->course['id'] != $course_info['id']) {
// check resources inside html from ckeditor tool and copy correct urls into recipient course
$answer['answer'] = DocumentManager::replaceUrlWithNewCourseCode(

@ -37,10 +37,9 @@ class CalculatedAnswer extends Question
$preArray = explode('@@', $objAnswer->selectAnswer(1));
$defaults['formula'] = array_pop($preArray);
$defaults['answer'] = array_shift($preArray);
$defaults['answer'] = preg_replace("/\[.*\]/", "", $defaults['answer']);
$defaults['answer'] = preg_replace("/\[.*\]/", '', $defaults['answer']);
$defaults['weighting'] = $this->weighting;
}
$lowestValue = '1.00';
$highestValue = '20.00';

Loading…
Cancel
Save