Including epiclock js library + deleting the old js library see #5043

main/exercice/exercise_reminder.php

@@ -55,19 +55,21 @@ if (!$objExercise) {
 }
 
 $time_control = false;
-if ($objExercise->expired_time != 0 && $origin != 'learnpath') {
+$clock_expired_time = get_session_time_control_key($objExercise->id, $learnpath_id, $learnpath_item_id);
+
+if ($objExercise->expired_time != 0 && !empty($clock_expired_time)) {
 	$time_control = true;
 }
 
-$clock_expired_time = get_session_time_control_key($objExercise->id, $learnpath_id);
-
-// Get time left for exipiring time
-$time_left = api_strtotime($clock_expired_time,'UTC') - time();
-
 if ($time_control) {
-	$htmlHeadXtra[] = api_get_js('jquery.epiclock.min.js');
-	$htmlHeadXtra[] = $objExercise->show_time_control_js($time_left); 
-	
+    // Get time left for exipiring time
+    $time_left = api_strtotime($clock_expired_time,'UTC') - time();
+	$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
+    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
+    $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
+    $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.epiclock.min.js');
+    $htmlHeadXtra[] = api_get_js('epiclock/renderers/minute/epiclock.minute.js');
+	$htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);	
 }
 
 

main/exercice/exercise_show.php

@@ -93,7 +93,7 @@ if (empty($objExercise)) {
 $feedback_type = $objExercise->feedback_type;
 
 //If is not valid
-$session_control_key = get_session_time_control_key($exercise_id);
+$session_control_key = get_session_time_control_key($exercise_id, $learnpath_id, $learnpath_item_id);
 if (isset($session_control_key) && !exercise_time_control_is_valid($exercise_id, $learnpath_id, $learnpath_item_id) && !in_array($action, array('qualify','edit'))) {
     $sql_fraud = "UPDATE $TBL_TRACK_ATTEMPT SET answer = 0, marks=0, position=0 WHERE exe_id = $id ";
     Database::query($sql_fraud);

main/exercice/overview.php

@@ -45,16 +45,16 @@ $interbreadcrumb[] = array ("url" => "exercice.php?gradebook=$gradebook", "name"
 $interbreadcrumb[] = array ("url" => "#","name" => $objExercise->name);
 
 $time_control = false;
-$clock_expired_time = get_session_time_control_key($objExercise->id);
+$clock_expired_time = get_session_time_control_key($objExercise->id, $learnpath_id, $learnpath_item_id);
 
-$time_left = null;
 if ($objExercise->expired_time != 0 && !empty($clock_expired_time)) {
-	$time_control = true;        
-    // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time,'UTC') - time();    
+	$time_control = true;    
 }
 
-if ($time_control) {    
+if ($time_control) {
+    // Get time left for expiring time
+    $time_left = api_strtotime($clock_expired_time,'UTC') - time();
+    
 	$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');