Merge

main/inc/lib/tracking.lib.php

@@ -2253,14 +2253,17 @@ class Tracking {
                     $exercices['title'] = Display::url($exercices['title'], $url, array('target'=>'_blank'));
                     $html .= Display::tag('td', $exercices['title']);
                     
-                    //Exercise configuration show results
-                    if ($exercices['results_disabled'] == 0) {
+                                            
+                    
+                    //Exercise configuration show results show results or show only score
+                    if ($exercices['results_disabled'] == 0 || $exercices['results_disabled'] == 2) {
                         $latest_attempt_url = '';
                         $best_score = $position = $percentage_score_result  = '-';
                         $graph = $normal_graph = null;
-                                                
+
+                        //Getting best results 
                         $best_score_data = get_best_score($exercices['id'], $course_info['code'], $session_id);     
-                        $best_score      = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);
+                        $best_score      = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);                       
                                                
                         if ($attempts > 0) {
                             $latest_attempt_url .= '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$exe_id.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>';
@@ -2293,11 +2296,11 @@ class Tracking {
                         
                     } else {
                         // Exercise configuration NO results
-                        $html .= Display::tag('td', 0, array('align'=>'center'));  
+                        $html .= Display::tag('td', $attempts,                 array('align'=>'center'));       
                         $html .= Display::tag('td', '-', array('align'=>'center'));                            
                         $html .= Display::tag('td', '-', array('align'=>'center'));
                         $html .= Display::tag('td', '-', array('align'=>'center'));
-                        $html .= Display::tag('td', '-', array('align'=>'center'));                            
+                        $html .= Display::tag('td', '-', array('align'=>'center'));                         
                     }
                     $html .= '</tr>';
                 }