Explorar el Código

Changing function name, adding comments

Julio Montoya hace 11 años
padre
commit
d885f1d0d3

+ 1 - 1
main/exercice/exercise_reminder.php

@@ -68,7 +68,7 @@ $exe_id = null;
 if (isset($_SESSION['exe_id'])) {
 	$exe_id = intval($_SESSION['exe_id']);
 }
-$exercise_stat_info	= $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+$exercise_stat_info	= $objExercise->getStatTrackExerciseInfoByExeId($exe_id);
 if (!empty($exercise_stat_info['data_tracking'])) {
 	$question_list = explode(',', $exercise_stat_info['data_tracking']);
 }

+ 3 - 3
main/exercice/exercise_result.php

@@ -63,7 +63,7 @@ if (empty($objExercise)) {
     // Redirect to the exercise overview
     // Check if the exe_id exists
     $objExercise = new Exercise();
-    $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+    $exercise_stat_info = $objExercise->getStatTrackExerciseInfoByExeId($exe_id);
     if (!empty($exercise_stat_info) && isset($exercise_stat_info['exe_exo_id'])) {
         header("Location: overview.php?exerciseId=".$exercise_stat_info['exe_exo_id']);
         exit;
@@ -101,7 +101,7 @@ if (api_is_course_admin() && $origin != 'learnpath') {
 }
 
 $feedback_type = $objExercise->feedback_type;
-$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+$exercise_stat_info = $objExercise->getStatTrackExerciseInfoByExeId($exe_id);
 
 if (!empty($exercise_stat_info['data_tracking'])) {
     $question_list = explode(',', $exercise_stat_info['data_tracking']);
@@ -139,7 +139,7 @@ if ($objExercise->selectAttempts() > 0) {
 Display::display_normal_message(get_lang('Saved').'<br />', false);
 
 // Display questions.
-ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true);
+$objExercise->displayQuestionListByAttempt($exe_id, true);
 
 // If is not valid.
 $session_control_key = ExerciseLib::get_session_time_control_key($objExercise->id, $learnpath_id, $learnpath_item_id);

+ 11 - 11
main/exercice/exercise_show.php

@@ -295,39 +295,39 @@ foreach ($questionList as $questionId) {
     switch ($answerType) {
     }*/
 	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore      += $question_result['score'];
 	} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
 		$choice = array();
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 		echo '</table>';
 	} elseif ($answerType == FILL_IN_BLANKS) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == FREE_ANSWER) {
         $answer = $str;
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == ORAL_EXPRESSION) {
 		$answer = $str;
-		$question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+		$question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
 		$questionScore   = $question_result['score'];
 		$totalScore     += $question_result['score'];
 	} elseif ($answerType == MATCHING || $answerType == DRAGGABLE) {
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
 	} elseif ($answerType == HOT_SPOT) {
@@ -337,7 +337,7 @@ foreach ($questionList as $questionId) {
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
 		}
-        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $question_result = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
         $questionScore  = $question_result['score'];
         $totalScore    += $question_result['score'];
 
@@ -354,7 +354,7 @@ foreach ($questionList as $questionId) {
         }
 	} else if($answerType == HOT_SPOT_DELINEATION) {
 
-        $question_result  = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg(), 'database');
+        $question_result  = $objExercise->manageAnswers($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results);
 
         $questionScore    = $question_result['score'];
         $totalScore      += $question_result['score'];
@@ -680,7 +680,7 @@ if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type'])))
 	    if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
 	        $my_total_score_temp = 0;
 	    }
-        $total_score_text .= ExerciseLib::get_question_ribbon($objExercise, $my_total_score_temp, $totalWeighting, true);
+        $total_score_text .= $objExercise->get_question_ribbon($my_total_score_temp, $totalWeighting, true);
         $total_score_text .= '</div>';
 	}
 }

+ 5 - 5
main/exercice/exercise_submit.php

@@ -453,7 +453,7 @@ if ($objExercise->selectAttempts() > 0) {
 }
 
 // 5. Getting user exercise info (if the user took the exam before) - generating exe_id
-$exercise_stat_info = $objExercise->get_stat_track_exercise_info($learnpath_id, $learnpath_item_id, $learnpath_item_view_id);
+$exercise_stat_info = $objExercise->getStatTrackExerciseInfo($learnpath_id, $learnpath_item_id, $learnpath_item_view_id);
 
 //if (1) {
 if (!isset($_SESSION['questionList'])) {
@@ -504,7 +504,7 @@ if (empty($exercise_stat_info)) {
 		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
 	}
 	$exe_id = $objExercise->save_stat_track_exercise_info($clock_expired_time, $learnpath_id, $learnpath_item_id, $learnpath_item_view_id, $questionListFlatten, $total_weight);
-	$exercise_stat_info = $objExercise->get_stat_track_exercise_info($learnpath_id, $learnpath_item_id, $learnpath_item_view_id);
+	$exercise_stat_info = $objExercise->getStatTrackExerciseInfo($learnpath_id, $learnpath_item_id, $learnpath_item_view_id);
     if ($debug)  error_log("5.5  Creating a new attempt exercise_stat_info[] exe_id : $exe_id");
 } else {
 	$exe_id = $exercise_stat_info['exe_id'];
@@ -514,7 +514,7 @@ if (empty($exercise_stat_info)) {
 // Array to check in order to block the chat
 ExerciseLib::create_chat_exercise_session($exe_id);
 
-if ($debug) { error_log('6. $objExercise->get_stat_track_exercise_info function called::  '.print_r($exercise_stat_info, 1)); };
+if ($debug) { error_log('6. $objExercise->getStatTrackExerciseInfo function called::  '.print_r($exercise_stat_info, 1)); };
 
 if (!empty($exercise_stat_info['questions_to_check'])) {
 	$my_remind_list = $exercise_stat_info['questions_to_check'];
@@ -649,8 +649,8 @@ if ($formSent && isset($_POST)) {
                     $choice = $exerciseResult[$questionId];
                     if (isset($exe_id)) {
                     	//Manage the question and answer attempts
-                        if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
-                    	$objExercise->manage_answer($exe_id, $questionId, $choice,'exercise_show',$exerciseResultCoordinates, true, false,false, $objExercise->propagate_neg);
+                        if ($debug) { error_log('8.3. manageAnswers exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
+                    	$objExercise->manageAnswers($exe_id, $questionId, $choice,'exercise_show',$exerciseResultCoordinates, true, false,false);
                     }
                     //END of saving and qualifying
                 }

+ 1 - 1
main/exercice/overview.php

@@ -90,7 +90,7 @@ if (isset($_GET['preview'])) {
 	$extra_params = '&preview=1';
 }
 
-$exercise_stat_info = $objExercise->get_stat_track_exercise_info($learnpath_id, $learnpath_item_id, 0);
+$exercise_stat_info = $objExercise->getStatTrackExerciseInfo($learnpath_id, $learnpath_item_id, 0);
 $attempt_list = null;
 if (isset($exercise_stat_info['exe_id'])) {
 	$attempt_list = getAllExerciseEventByExeId($exercise_stat_info['exe_id']);

+ 2 - 2
main/exercice/result.php

@@ -71,6 +71,6 @@ if ($show_headers) {
 	Display::display_reduced_header();
 }
 
-ExerciseLib::display_question_list_by_attempt($objExercise, $id, false);
+$objExercise->displayQuestionListByAttempt($id, false);
 
-Display::display_footer();
+Display::display_footer();

+ 15 - 14
main/gradebook/lib/be/exerciselink.class.php

@@ -17,7 +17,8 @@ class ExerciseLink extends AbstractLink
     private $exercise_data = null;
 
     // CONSTRUCTORS
-    function __construct() {
+    function __construct()
+    {
     	parent::__construct();
     	$this->set_type(LINK_EXERCISE);
     }
@@ -28,8 +29,10 @@ class ExerciseLink extends AbstractLink
 	 * Generate an array of exercises that a teacher hasn't created a link for.
 	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
 	 */
-    public function get_not_created_links() {
+    public function get_not_created_links()
+    {
         return false;
+
     	if (empty($this->course_code)) {
             die('Error in get_not_created_links() : course code not set');
     	}
@@ -55,7 +58,8 @@ class ExerciseLink extends AbstractLink
 	 * Generate an array of all exercises available.
 	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
 	 */
-    public function get_all_links() {
+    public function get_all_links()
+    {
     	if (empty($this->course_code)) {
     		die('Error in get_not_created_links() : course code not set');
     	}
@@ -69,10 +73,6 @@ class ExerciseLink extends AbstractLink
 		$sql = 'SELECT id,title from '.$this->get_exercise_table().'
 				WHERE c_id = '.$this->course_id.' AND active=1  '.$session_condition;
 
-
-  /*      $sql = 'SELECT id,title from '.$this->get_exercise_table().'
-				WHERE c_id = '.$this->course_id.' AND active=1 AND session_id='.api_get_session_id().'';
-	*/
 		$result = Database::query($sql);
 		$cats = array();
 		while ($data=Database::fetch_array($result)) {
@@ -98,28 +98,29 @@ class ExerciseLink extends AbstractLink
 
     /**
 	 * Get the score of this exercise. Only the first attempts are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
+	 * @param int $stud_id student id (default: all students who have results - then the average is returned)
 	 * @return	array (score, max) if student is given
 	 * 			array (sum of scores, number of scores) otherwise
 	 * 			or null if no scores available
 	 */
-    public function calc_score($stud_id = null) {
+    public function calc_score($stud_id = null)
+    {
     	$tbl_stats = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
-    	//$tbl_stats_e_attempt_recording = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
-        //the following query should be similar (in conditions) to the one used in exercice/exercice.php, look for note-query-exe-results marker
+        // The following query should be similar (in conditions)
+        // to the one used in exercice/exercice.php, look for note-query-exe-results marker
         $session_id = api_get_session_id();
 		$sql = "SELECT * FROM $tbl_stats
                 WHERE   exe_exo_id      = ".intval($this->get_ref_id())." AND
                         orig_lp_id      = 0 AND
                         orig_lp_item_id = 0 AND
                         status      <> 'incomplete' AND
-                        session_id = $session_id
-                ";
+                        session_id = $session_id";
 
 		if (isset($stud_id)) {
     		$sql .= " AND c_id = '{$this->course_id}' AND
                       exe_user_id = '$stud_id' ";
     	}
+
 		$sql .= ' ORDER BY exe_id DESC';
         $scores = Database::query($sql);
 
@@ -252,4 +253,4 @@ class ExerciseLink extends AbstractLink
     public function get_icon_name() {
 		return 'exercise';
 	}
-}
+}

+ 14 - 7
main/inc/ajax/exercise.ajax.php

@@ -345,7 +345,7 @@ switch ($action) {
             }
 
             // Getting information of the current exercise.
-            $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+            $exercise_stat_info = $objExercise->getStatTrackExerciseInfoByExeId($exe_id);
 
             $exercise_id = $exercise_stat_info['exe_exo_id'];
 
@@ -456,7 +456,16 @@ switch ($action) {
 
                 if ($type == 'simple') {
                     //Getting old attempt in order to decrees the total score
-                    $old_result = $objExercise->manage_answer($exe_id, $my_question_id, null, 'exercise_show', array(), false, true, false, $objExercise->selectPropagateNeg());
+                    $old_result = $objExercise->manageAnswers(
+                        $exe_id,
+                        $my_question_id,
+                        null,
+                        'exercise_show',
+                        array(),
+                        false,
+                        true,
+                        false
+                    );
 
                     //Removing old score
                     $total_score = $total_score - $old_result['score'];
@@ -476,7 +485,7 @@ switch ($action) {
 
             	// We're inside *one* question. Go through each possible answer for this question
 
-            	$result = $objExercise->manage_answer(
+            	$result = $objExercise->manageAnswers(
                     $exe_id,
                     $my_question_id,
                     $my_choice,
@@ -485,9 +494,7 @@ switch ($action) {
                     true,
                     false,
                     false,
-                    $objExercise->selectPropagateNeg(),
-                    $hotspot_delineation_result,
-                    true
+                    $hotspot_delineation_result
                 );
 
                 //Adding the new score
@@ -500,7 +507,7 @@ switch ($action) {
                 $now = time();
 
                 if ($type == 'all') {
-                    $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+                    $exercise_stat_info = $objExercise->getStatTrackExerciseInfoByExeId($exe_id);
                 }
 
                 $key = ExerciseLib::get_time_control_key($exercise_id, $exercise_stat_info['orig_lp_id'], $exercise_stat_info['orig_lp_item_id']);