Эх сурвалжийг харах

Now we show the timer when using an exercise with question in one page (partial)

Julio Montoya 13 жил өмнө
parent
commit
aafd52019f

+ 7 - 14
main/exercice/exercise.class.php

@@ -1023,18 +1023,10 @@ class Exercise {
 			$form->addElement('html','<div id="end_date_div" style="display:none;">');
 
 			$form->addElement('datepicker', 'end_time', '', array('form_name'=>'exercise_admin'), 5);
-
-			//$form->addElement('select', 'enabletimercontroltotalminutes',get_lang('ExerciseTimerControlMinutes'),$time_minutes_option);
 			$form->addElement('html','</div>');
 
-			$check_option=$this->selectType();
-
-			if ($check_option==1 && isset($_GET['exerciseId'])) {
-				$diplay = 'none';
-			} else {
-				$diplay = 'block';
-			}
-				
+			//$check_option=$this->selectType();
+			$diplay = 'block';							
 			$form->addElement('checkbox', 'propagate_neg',get_lang('PropagateNegativeResults'),null);
 				
 			$form->addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
@@ -1046,6 +1038,7 @@ class Exercise {
 			$expired_date = (int)$this->selectExpiredTime();
 
 			if(($expired_date!='0')) {
+				
 				$form->addElement('html','<div id="timercontrol" style="display:block;">');
 			} else {
 				$form->addElement('html','<div id="timercontrol" style="display:none;">');
@@ -1128,7 +1121,7 @@ class Exercise {
 				$defaults['end_time']   = ($this->end_time!='0000-00-00 00:00:00')?$this->end_time : date('Y-m-d 12:00:00',time()+84600);
 
 				//Get expired time
-				if($this->expired_time != '0') {
+				if($this->expired_time != '0') {					
 					$defaults['enabletimercontrol'] = 1;
 					$defaults['enabletimercontroltotalminutes'] = $this->expired_time;
 				} else {
@@ -1534,13 +1527,13 @@ class Exercise {
 		array_map('intval', $questionList);
 		
 		$weight = Database::escape_string($weight);
-		if ($this->type == ONE_PER_PAGE) {
+		//if ($this->type == ONE_PER_PAGE) {
 			$sql = "INSERT INTO $track_exercises ($sql_fields exe_exo_id, exe_user_id, exe_cours_id, status,session_id, data_tracking, start_date, orig_lp_id, orig_lp_item_id, exe_weighting)
                     VALUES($sql_fields_values '".$this->id."','" . api_get_user_id() . "','" . api_get_course_id() . "','incomplete','" . api_get_session_id() . "','" . implode(',', $questionList) . "', '" . api_get_utc_datetime() . "', '$safe_lp_id', '$safe_lp_item_id', '$weight' )";
-		} else {
+		/*} else {
 			$sql = "INSERT INTO $track_exercises ($sql_fields exe_exo_id, exe_user_id, exe_cours_id, status, session_id, start_date, orig_lp_id, orig_lp_item_id)
                     VALUES($sql_fields_values '".$this->id."','".api_get_user_id()."','".api_get_course_id()."','incomplete','".api_get_session_id()."','".api_get_utc_datetime()."', '$safe_lp_id', '$safe_lp_item_id')";
-		}
+		}*/
 		Database::query($sql);
 		$id = Database::insert_id();
 		return $id;		

+ 4 - 5
main/exercice/exercise_admin.php

@@ -98,20 +98,19 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 	    }  	
       	
      	function check_per_page_one() {
-     		if (document.getElementById(\'divtimecontrol\').style.display==\'none\') {
-     		
+     		/*if (document.getElementById(\'divtimecontrol\').style.display==\'none\') {     		
      			document.getElementById(\'divtimecontrol\').style.display=\'block\';
      			document.getElementById(\'divtimecontrol\').display=block;
      			document.getElementById(\'timecontrol\').display=none;
-     		}
+     		}*/
      		document.getElementById(\'exerciseType_0\').checked=true;
 		}
 
 		function check_per_page_all() {
-			if (document.getElementById(\'divtimecontrol\').style.display==\'block\') {
+			/*if (document.getElementById(\'divtimecontrol\').style.display==\'block\') {
 				document.getElementById(\'divtimecontrol\').style.display=\'none\';
 				document.getElementById(\'enabletimercontroltotalminutes\').value=\'\';
-			}
+			}*/
 			if (document.getElementById(\'exerciseType_1\').checked) {
 				document.getElementById(\'exerciseType_0\').checked = true;
 			}

+ 1 - 0
main/exercice/exercise_result.php

@@ -122,6 +122,7 @@ if (api_is_course_admin() && $origin != 'learnpath') {
 $feedback_type           = $objExercise->feedbacktype;
 
 $exercise_stat_info      = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+
 if (!empty($exercise_stat_info['data_tracking'])) {
 	$question_list		= explode(',', $exercise_stat_info['data_tracking']);
 }

+ 3 - 10
main/exercice/exercise_submit.php

@@ -156,13 +156,6 @@ if (!is_object($objExercise)) {
 $current_timestamp 	= time();
 $my_remind_list 	= array();
 
-//4. Setting the exe_id (attempt id)
-/*
-$exe_id = null;
-if (isset($_SESSION['exe_id'])) {
-	$exe_id = $_SESSION['exe_id'];
-}*/
-
 $time_control = false;
 if ($objExercise->expired_time != 0 && $origin != 'learnpath') {
 	$time_control = true;
@@ -183,7 +176,7 @@ $exercise_stat_info = $objExercise->get_stat_track_exercise_info($safe_lp_id, $s
 
 if (empty($exercise_stat_info)) {
 	$total_weight = 0;
-	$questionList = $objExercise->get_validated_question_list();
+	$questionList = $objExercise->get_validated_question_list();	
 	foreach($questionList as $question_id) {
 		$objQuestionTmp = Question::read($question_id);
 		$total_weight += floatval($objQuestionTmp->weighting);
@@ -423,8 +416,8 @@ if ($formSent && isset($_POST)) {
                             echo '</body></html>';
                         }                        
                     }
-                }             
-                header("Location: exercise_result.php?origin=$origin&learnpath_id=$safe_lp_id&learnpath_item_id=$safe_lp_item_id&learnpath_item_view_id=$safe_lp_item_view_id");
+                }                            
+                header("Location: exercise_result.php?exe_id=$exe_id&origin=$origin&learnpath_id=$safe_lp_id&learnpath_item_id=$safe_lp_item_id&learnpath_item_view_id=$safe_lp_item_view_id");
                 exit;
             } else {
                 //Time control is only enabled for ONE PER PAGE