chamilo / chamilo-lms

main/exercice/question_list_admin.inc.php

Spacing +13 added lines, -14 removed lines

@@ -140,7 +140,7 @@ 
             .sortable({
                 cursor: "move", // works?
                 update: function(event, ui) {
-                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']);?>";
+                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']); ?>";
                     $.post("<?php echo $ajax_url ?>", order, function(reponse){
                         $("#message").html(reponse);
                     });
@@ -176,11 +176,11 @@ 
     echo "<div class='table-responsive'>";
     echo "<table class='table table-condensed'>";
     echo "<tr>";
-    echo "<th style=\"width: 50%;\">" .get_lang('Questions'). "</th>";
-    echo "<th style=\"width: 6%;\">" .get_lang('Type'). "</th>";
-    echo "<th style=\"width: 22%; text-align:center;\">" .get_lang('Category'). "</th>";
-    echo "<th style=\"width: 6%;\">" .get_lang('Difficulty'). "</th>";
-    echo "<th style=\"width: 16%; float:left;\">" .get_lang('Score'). "</th>";
+    echo "<th style=\"width: 50%;\">".get_lang('Questions')."</th>";
+    echo "<th style=\"width: 6%;\">".get_lang('Type')."</th>";
+    echo "<th style=\"width: 22%; text-align:center;\">".get_lang('Category')."</th>";
+    echo "<th style=\"width: 6%;\">".get_lang('Difficulty')."</th>";
+    echo "<th style=\"width: 16%; float:left;\">".get_lang('Score')."</th>";
     echo "</tr>";
     echo "</table>";
     echo "</div>";
@@ -220,15 +220,14 @@ 
                 $question_class = get_class($objQuestionTmp);
 
                 $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.
-                    Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
+                    Display::return_icon('cd.gif', get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
                 $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ?
                     '<a>'.Display::return_icon(
                         'edit_na.png',
                         get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'),
                         array(),
                         ICON_SIZE_SMALL
-                    ).'</a>' :
-                    '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
+                    ).'</a>' : '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
                     $objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.
                     Display::return_icon(
                         'edit.png',
@@ -238,16 +237,16 @@ 
                     ).'</a>';
                 $delete_link = null;
                 if ($objExercise->edit_exercise_in_lp == true) {
-                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
+                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png', get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
                 }
 
-                $edit_link = Display::tag('div', $edit_link,   array('style'=>'float:left; padding:0px; margin:0px'));
-                $clone_link = Display::tag('div', $clone_link,  array('style'=>'float:left; padding:0px; margin:0px'));
+                $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px'));
+                $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px'));
                 $delete_link = Display::tag('div', $delete_link, array('style'=>'float:left; padding:0px; margin:0px'));
                 $actions = Display::tag(
                     'div',
                     $edit_link.$clone_link.$delete_link,
-                    array('class'=>'edition','style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;')
+                    array('class'=>'edition', 'style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;')
                 );
 
                 $title = Security::remove_XSS($objQuestionTmp->selectTitle());
@@ -287,7 +286,7 @@ 
                 $questionScore = Display::tag('div', $objQuestionTmp->selectWeighting(), array('style'=>$styleScore));
 
                 echo '<div id="question_id_list_'.$id.'" >';
-                echo '<div class="header_operations" data-exercise="' . $objExercise->selectId() . '" data-question="' . $id . '">';
+                echo '<div class="header_operations" data-exercise="'.$objExercise->selectId().'" data-question="'.$id.'">';
                 echo $questionName;
                 echo $questionType;
                 echo $questionCategory;

main/inc/ajax/exercise.ajax.php

Spacing +17 added lines, -17 removed lines

@@ -30,10 +30,10 @@ 
         $exercise_id = intval($_GET['exercise_id']);
         $page = intval($_REQUEST['page']); //page
         $limit = intval($_REQUEST['rows']); //quantity of rows
-        $sidx = $_REQUEST['sidx'];         //index to filter
-        $sord = $_REQUEST['sord'];         //asc or desc
+        $sidx = $_REQUEST['sidx']; //index to filter
+        $sord = $_REQUEST['sord']; //asc or desc
 
-        if (!in_array($sord, array('asc','desc'))) {
+        if (!in_array($sord, array('asc', 'desc'))) {
             $sord = 'desc';
         }
         // get index row - i.e. user click to sort $sord = $_GET['sord'];
@@ -62,7 +62,7 @@ 
         $total_pages = 0;
         if ($count > 0) {
             if (!empty($limit)) {
-                $total_pages = ceil($count/$limit);
+                $total_pages = ceil($count / $limit);
             }
         }
 
@@ -124,7 +124,7 @@ 
         $response->page = $page;
         $response->total = $total_pages;
         $response->records = $count;
-        $i=0;
+        $i = 0;
 
         if (!empty($results)) {
             foreach ($results as $row) {
@@ -138,22 +138,22 @@ 
                             GROUP by question_id
                         ) as count_table";
                 $result_count = Database::query($sql);
-                $count_questions = Database::fetch_array($result_count,'ASSOC');
+                $count_questions = Database::fetch_array($result_count, 'ASSOC');
                 $count_questions = $count_questions['count_question_id'];
 
                 $row['count_questions'] = $count_questions;
 
                 $response->rows[$i]['id'] = $row['exe_id'];
-                $remaining = strtotime($row['start_date'])+($oExe->expired_time*60) - strtotime(api_get_utc_datetime(time()));
-                $h = floor($remaining/3600);
-                $m = floor(($remaining - ($h*3600))/60);
-                $s = ($remaining - ($h*3600) - ($m*60));
+                $remaining = strtotime($row['start_date']) + ($oExe->expired_time * 60) - strtotime(api_get_utc_datetime(time()));
+                $h = floor($remaining / 3600);
+                $m = floor(($remaining - ($h * 3600)) / 60);
+                $s = ($remaining - ($h * 3600) - ($m * 60));
                 $array = array(
                     $row['firstname'],
                     $row['lastname'],
-                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h>0?$h.':':'').sprintf("%02d",$m).':'.sprintf("%02d",$s).']',
+                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h > 0 ? $h.':' : '').sprintf("%02d", $m).':'.sprintf("%02d", $s).']',
                     $row['count_questions'],
-                    round($row['score']*100).'%'
+                    round($row['score'] * 100).'%'
                 );
                 $response->rows[$i]['cell'] = $array;
                 $i++;
@@ -209,7 +209,7 @@ 
         break;
     case 'add_question_to_reminder':
         /** @var Exercise $objExercise */
-        $objExercise  = $_SESSION['objExercise'];
+        $objExercise = $_SESSION['objExercise'];
         if (empty($objExercise)) {
             echo 0;
             exit;
@@ -360,8 +360,8 @@ 
                 $objQuestionTmp = Question::read($my_question_id, $course_id);
 
                 // Getting free choice data.
-                if ($objQuestionTmp->type  == FREE_ANSWER && $type == 'all') {
-                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id]: null;
+                if ($objQuestionTmp->type == FREE_ANSWER && $type == 'all') {
+                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id] : null;
                 }
 
                 if ($type == 'all') {
@@ -405,7 +405,7 @@ 
                         $session_id,
                         $my_question_id
                     );
-                    if ($objQuestionTmp->type  == HOT_SPOT) {
+                    if ($objQuestionTmp->type == HOT_SPOT) {
                         Event::delete_attempt_hotspot(
                             $exe_id,
                             api_get_user_id(),
@@ -517,7 +517,7 @@ 
         $objQuestion = Question::read($questionId);
         $objQuestion->get_question_type_name();
 
-        echo '<p class="lead">' . $objQuestion->get_question_type_name() . '</p>';
+        echo '<p class="lead">'.$objQuestion->get_question_type_name().'</p>';
         //echo get_lang('Level').': '.$objQuestionTmp->selectLevel();
         ExerciseLib::showQuestion(
             $questionId,