Julio Montoya 11 жил өмнө
parent
commit
4561ed3ab4

+ 14 - 1
main/css/base.css

@@ -5310,7 +5310,20 @@ i.size-32.icon-new-work {
     padding: 7px 9px;
 }
 
-
 .question_no_title {
+    text-align: center;
+}
+
+.main_question .media .media-object {
     font-weight: bold;
+    background-color: #ccc;
+    width:32px;
+    height:32px;
+    padding:8px 2px 0px 2px;
+    border-radius: 5px;
+}
+
+.main_question .media .question_description {
+    padding-top: 5px;
+
 }

+ 5 - 1
main/exercice/exercise_submit.php

@@ -337,11 +337,15 @@ we delete the objExercise from the session in order to get the latest changes in
 if (api_is_allowed_to_edit(null, true) && isset($_GET['preview']) && $_GET['preview'] == 1) {
     Session::erase('objExercise');
 }
+/** @var \Exercise $exerciseInSession */
 $exerciseInSession = Session::read('objExercise');
 
+
+
 // 1. Loading the $objExercise variable
 if (!isset($exerciseInSession) || isset($exerciseInSession) && ($exerciseInSession->id != $_GET['exerciseId'])) {
     // Construction of Exercise
+
     /** @var \Exercise $objExercise */
     $objExercise = new Exercise();
     if ($debug) {
@@ -351,7 +355,7 @@ if (!isset($exerciseInSession) || isset($exerciseInSession) && ($exerciseInSessi
 
     // if the specified exercise doesn't exist or is disabled
     if (!$objExercise->read($exerciseId) || (!$objExercise->selectStatus() && !$is_allowedToEdit && ($origin != 'learnpath'))) {
-    	if ($debug) {
+        if ($debug) {
             error_log('1.1. Error while reading the exercise');
         }
         unset($objExercise);

+ 0 - 4
main/inc/lib/array.lib.php

@@ -138,15 +138,11 @@ class ArrayClass
     public static function shuffle_assoc(&$array)
     {
         $keys = array_keys($array);
-
         shuffle($keys);
-
         foreach ($keys as $key) {
             $new[$key] = $array[$key];
         }
-
         $array = $new;
-
         return true;
     }
 }

+ 11 - 11
main/template/default/mail/exercise/end_exercise_notification.tpl

@@ -2,24 +2,24 @@
 
 {{ 'UserInformation' | get_lang }}
 
-1. {{student.username}}
+1. {{ student.username }}
 
-2. {{student.firstname}}
+2. {{ student.firstname }}
 
-3. {{student.lastname}}
+3. {{ student.lastname }}
 
-4. {{student.official_code}}
+4. {{ student.official_code }}
 
-5. {{exercise.title}}
+5. {{ exercise.title }}
 
-6. {{exercise.start_time}}
+6. {{ exercise.start_time }}
 
-7. {{exercise.end_time}}
+7. {{ exercise.end_time }}
 
-8. {{course.title}}
+8. {{ course.title }}
 
-9. {{course.code}}
+9. {{ course.code }}
 
-10. {{question_and_answer_ids}}
+10. {{ question_and_answer_ids }}
 
-11. {{asserts}}
+11. {{ asserts }}