소스 검색

Minor - format code

Julio Montoya 9 년 전
부모
커밋
16620dab75
3개의 변경된 파일66개의 추가작업 그리고 15개의 파일을 삭제
  1. 18 5
      main/exercice/answer.class.php
  2. 12 4
      main/exercice/exercise_result.php
  3. 36 6
      main/exercice/exercise_submit.php

+ 18 - 5
main/exercice/answer.class.php

@@ -71,6 +71,7 @@ class Answer
         $objExercise = new Exercise($this->course_id);
         $exerciseId = isset($_REQUEST['exerciseId']) ? $_REQUEST['exerciseId'] : null;
         $objExercise->read($exerciseId);
+
         if ($objExercise->random_answers == '1') {
             $this->readOrderedBy('rand()', '');// randomize answers
         } else {
@@ -198,8 +199,8 @@ class Answer
 			$order = 'ASC';
 		}
 
-		$TBL_ANSWER   = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$TBL_QUIZ     = Database::get_course_table(TABLE_QUIZ_QUESTION);
+		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+		$TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
 		$questionId = intval($this->questionId);
 
 		$sql = "SELECT type FROM $TBL_QUIZ
@@ -207,8 +208,20 @@ class Answer
 		$result_question = Database::query($sql);
 		$question_type = Database::fetch_array($result_question);
 
-		$sql = "SELECT answer,correct,comment,ponderation,position, hotspot_coordinates, hotspot_type, destination, id_auto
-                FROM $TBL_ANSWER WHERE c_id = {$this->course_id} AND question_id='".$questionId."'
+		$sql = "SELECT
+		            answer,
+		            correct,
+		            comment,
+		            ponderation,
+		            position,
+		            hotspot_coordinates,
+		            hotspot_type,
+		            destination,
+		            id_auto
+                FROM $TBL_ANSWER
+                WHERE
+                    c_id = {$this->course_id} AND
+                    question_id='".$questionId."'
                 ORDER BY $field $order";
 		$result=Database::query($sql);
 
@@ -312,7 +325,7 @@ class Answer
 		$rs = Database::query($sql);
 
 		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs);
+			$row = Database::fetch_array($rs, 'ASSOC');
 
 			return $row;
 		}

+ 12 - 4
main/exercice/exercise_result.php

@@ -59,12 +59,18 @@ if (isset($_SESSION['gradebook'])) {
 	$gradebook=	$_SESSION['gradebook'];
 }
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[] = array(
+        'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+        'name' => get_lang('ToolGradebook'),
+    );
 }
 
 $nameTools = get_lang('Exercises');
 
-$interbreadcrumb[]= array("url" => "exercise.php?gradebook=$gradebook","name" => get_lang('Exercises'));
+$interbreadcrumb[] = array(
+    "url" => "exercise.php?".api_get_cidreq(),
+    "name" => get_lang('Exercises'),
+);
 
 if ($origin != 'learnpath') {
 	// So we are not in learnpath tool
@@ -78,8 +84,10 @@ if ($origin != 'learnpath') {
 // I'm in a preview mode as course admin. Display the action menu.
 if (api_is_course_admin() && $origin != 'learnpath') {
 	echo '<div class="actions">';
-	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
-	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
+	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
+        Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
+	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+        Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
 	echo '</div>';
 }
 

+ 36 - 6
main/exercice/exercise_submit.php

@@ -100,7 +100,9 @@ if (api_is_allowed_to_edit(null,true) && isset($_GET['preview']) && $_GET['previ
 
 // 1. Loading the $objExercise variable
 
-if (!isset($_SESSION['objExercise']) || $_SESSION['objExercise']->id != $_REQUEST['exerciseId']) {
+if (!isset($_SESSION['objExercise']) ||
+    $_SESSION['objExercise']->id != $_REQUEST['exerciseId']
+) {
     // Construction of Exercise
     $objExercise = new Exercise();
     Session::write('firstTime', true);
@@ -190,9 +192,20 @@ if ($objExercise->selectAttempts() > 0) {
                 if (!empty($exercise_stat_info)) {
                     $max_exe_id = max(array_keys($exercise_stat_info));
                     $last_attempt_info = $exercise_stat_info[$max_exe_id];
-                    $attempt_html .= Display::div(get_lang('Date').': '.api_get_local_time($last_attempt_info['exe_date']), array('id'=>''));
+                    $attempt_html .= Display::div(
+                        get_lang('Date').': '.api_get_local_time($last_attempt_info['exe_date']),
+                        array('id' => '')
+                    );
 
-                    $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+                    $attempt_html .= Display::return_message(
+                        sprintf(
+                            get_lang('ReachedMaxAttempts'),
+                            $exercise_title,
+                            $objExercise->selectAttempts()
+                        ),
+                        'warning',
+                        false
+                    );
 
                     if (!empty($last_attempt_info['question_list'])) {
                         foreach($last_attempt_info['question_list'] as $question_data) {
@@ -734,7 +747,16 @@ if (!empty($objExercise->description)) {
             });
          });
         </script>";
-    echo Display::generate_accordion(array(array('title' => get_lang('ExerciseDescriptionLabel'), 'content' => $objExercise->description)), 'jquery', 'description_content');
+    echo Display::generate_accordion(
+        array(
+            array(
+                'title' => get_lang('ExerciseDescriptionLabel'),
+                'content' => $objExercise->description,
+            ),
+        ),
+        'jquery',
+        'description_content'
+    );
 }
 
 if ($origin != 'learnpath') {
@@ -1039,7 +1061,6 @@ if (!empty($error)) {
     }
 
     foreach ($questionList as $questionId) {
-
         // for sequential exercises
         if ($objExercise->type == ONE_PER_PAGE) {
             // if it is not the right question, goes to the next loop iteration
@@ -1088,7 +1109,16 @@ if (!empty($error)) {
         echo '<div id="question_div_'.$questionId.'" class="main-question '.$remind_highlight.'" >';
 
         // Shows the question and its answers
-        ExerciseLib::showQuestion($questionId, false, $origin, $i, true, false, $user_choice, false);
+        ExerciseLib::showQuestion(
+            $questionId,
+            false,
+            $origin,
+            $i,
+            true,
+            false,
+            $user_choice,
+            false
+        );
 
         // Button save and continue
         switch ($objExercise->type) {