Browse Source

Merge pull request #1823 from aragonc/1.11.x

fix progress certicate
Alex Aragon Calixto 8 years ago
parent
commit
c141b4a803
1 changed files with 24 additions and 6 deletions
  1. 24 6
      main/inc/lib/userportal.lib.php

+ 24 - 6
main/inc/lib/userportal.lib.php

@@ -1153,6 +1153,7 @@ class IndexManager
         // Student info code check (shows student progress information on
         // courses list
         $studentInfo = api_get_configuration_value('course_student_info');
+        $viewGrid = api_get_configuration_value('view_grid_courses');
         $studentInfoProgress = (!empty($studentInfo['progress']) && $studentInfo['progress'] === true);
         $studentInfoScore = (!empty($studentInfo['score']) && $studentInfo['score'] === true);
         $studentInfoCertificate = (!empty($studentInfo['certificate']) && $studentInfo['certificate'] === true);
@@ -1248,10 +1249,18 @@ class IndexManager
                                     );
                                     $courses['in_category'][$key1]['student_info']['certificate'] = null;
                                     if (isset($category[0])) {
-                                        if ($category[0]->is_certificate_available($user_id)) {
-                                            $courses['in_category'][$key1]['student_info']['certificate'] = Display::label(get_lang('Yes'), 'success');
+                                        if ($viewGrid == 'true') {
+                                            if ($category[0]->is_certificate_available($user_id)) {
+                                                $courses['in_category'][$key1]['student_info']['certificate'] = get_lang('Yes');
+                                            } else {
+                                                $courses['in_category'][$key1]['student_info']['certificate'] = get_lang('No');
+                                            }
                                         } else {
-                                            $courses['in_category'][$key1]['student_info']['certificate'] = Display::label(get_lang('No'), 'danger');
+                                            if ($category[0]->is_certificate_available($user_id)) {
+                                                $courses['in_category'][$key1]['student_info']['certificate'] = Display::label(get_lang('Yes'), 'success');
+                                            } else {
+                                                $courses['in_category'][$key1]['student_info']['certificate'] = Display::label(get_lang('No'), 'danger');
+                                            }
                                         }
                                     }
                                 }
@@ -1287,11 +1296,20 @@ class IndexManager
                                 null
                             );
                             $courses['not_category'][$key]['student_info']['certificate'] = null;
+                           
                             if (isset($category[0])) {
-                                if ($category[0]->is_certificate_available($user_id)) {
-                                    $courses['not_category'][$key]['student_info']['certificate'] = Display::label(get_lang('Yes'), 'success');
+                                if ($viewGrid == 'true') {
+                                    if ($category[0]->is_certificate_available($user_id)) {
+                                        $courses['not_category'][$key]['student_info']['certificate'] = get_lang('Yes');
+                                    } else {
+                                        $courses['not_category'][$key]['student_info']['certificate'] = get_lang('No');
+                                    }
                                 } else {
-                                    $courses['not_category'][$key]['student_info']['certificate'] = Display::label(get_lang('No'), 'danger');
+                                    if ($category[0]->is_certificate_available($user_id)) {
+                                        $courses['not_category'][$key]['student_info']['certificate'] = Display::label(get_lang('Yes'), 'success');
+                                    } else {
+                                        $courses['not_category'][$key]['student_info']['certificate'] = Display::label(get_lang('No'), 'danger');
+                                    }
                                 }
                             }
                         }